Merge branch 'fix/server-service-scale-running-state' into feature/grid-service-deploy-startstop

Author: Tero Marttila

server/spec/jobs/grid_service_scheduler_worker_spec.rb

@@ -2,7 +2,9 @@
 describe GridServiceSchedulerWorker, celluloid: true do
 
   let(:grid) { Grid.create(name: 'test')}
-  let(:service) { GridService.create(name: 'test', image_name: 'foo/bar:latest', grid: grid)}
+  let(:service) { GridService.create(name: 'test', image_name: 'foo/bar:latest', grid: grid,
+    state: :running,
+  )}
   let(:subject) { described_class.new(false) }
 
   describe '#watch' do

server/spec/services/grid_service_deployer_spec.rb

@@ -1,7 +1,10 @@
 
 describe GridServiceDeployer do
   let(:grid) { Grid.create!(name: 'test-grid') }
-  let(:grid_service) { GridService.create!(image_name: 'kontena/redis:2.8', name: 'redis', grid: grid, deploy_requested_at: Time.now - 5.0, state: 'running') }
+  let(:grid_service) { GridService.create!(image_name: 'kontena/redis:2.8', name: 'redis', grid: grid,
+    state: :running,
+    deploy_requested_at: Time.now - 5.0,
+  ) }
   let(:grid_service_deploy) { GridServiceDeploy.create(grid_service: grid_service, started_at: Time.now.utc) }
   let(:node1) { grid.create_node!('node-1', node_id: SecureRandom.uuid, node_number: 1, mem_total: 1.gigabytes) }
   let(:strategy) { Scheduler::Strategy::HighAvailability.new }
@@ -137,6 +140,7 @@
           grid.grid_services.create!(
             name: 'redis',
             image_name: 'kontena/redis:2.8',
+            state: :running,
             deploy_opts: {
               min_health: 0.0,
             },