[fix] spec failure

spec/features/chorg/run_spec.rb

@@ -55,7 +55,7 @@
 
       expect(Chorg::Task.count).to eq 1
       Chorg::Task.first.tap do |task|
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 1
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first["name"] })
@@ -87,7 +87,7 @@
 
         expect(Chorg::Task.count).to eq 1
         Chorg::Task.first.tap do |task|
-          expect(task.state).to eq 'stop'
+          expect(task.state).to eq 'completed'
           expect(task.entity_logs.count).to eq 2
           expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
           expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first["name"] })
@@ -142,7 +142,7 @@
 
       expect(Chorg::Task.count).to eq 1
       Chorg::Task.first.tap do |task|
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 1
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first["name"] })
@@ -174,7 +174,7 @@
 
         expect(Chorg::Task.count).to eq 1
         Chorg::Task.first.tap do |task|
-          expect(task.state).to eq 'stop'
+          expect(task.state).to eq 'completed'
           expect(task.entity_logs.count).to eq 2
           expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
           expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first["name"] })

spec/features/cms/node/generate_pages_spec.rb

@@ -37,8 +37,8 @@
         end
       end
       task = Cms::Task.where(name: "cms:generate_pages", site_id: site.id, node_id: node.id).first
-      expect(task.started).to be >= start_at if task.state != "stop"
-      expect(task.state).to satisfy { |v| %w(running stop).include?(v) }
+      expect(task.started).to be >= start_at if task.state != "completed"
+      expect(task.state).to satisfy { |v| %w(running completed).include?(v) }
     end
   end
 end

spec/jobs/chorg/main_runner_spec.rb

@@ -25,7 +25,7 @@
       expect(Cms::Group.where(name: changeset.destinations.first["name"]).first).not_to be_nil
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 2
       expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
       expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first["name"] })
@@ -80,7 +80,7 @@
         expect(page.contact_link_name).to eq changeset.destinations.first["contact_link_name"]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 2
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -138,7 +138,7 @@
           expect(page.contact_link_name).to eq group.contact_link_name
 
           task.reload
-          expect(task.state).to eq 'stop'
+          expect(task.state).to eq 'completed'
           expect(task.entity_logs.count).to eq 1
           expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
           expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -199,7 +199,7 @@
         expect(page.contact_link_name).to eq changeset.destinations.first["contact_link_name"]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 2
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -256,7 +256,7 @@
           expect(page.contact_link_name).to eq changeset.destinations.first["contact_link_name"]
 
           task.reload
-          expect(task.state).to eq 'stop'
+          expect(task.state).to eq 'completed'
           expect(task.entity_logs.count).to eq 2
           expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
           expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -322,7 +322,7 @@
         expect(user2.group_ids).to eq [new_group.id]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 7
 
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
@@ -417,7 +417,7 @@
         expect(user2.group_ids).to eq [new_group.id]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 4
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['id']).to eq group1.id.to_s
@@ -485,7 +485,7 @@
         expect(user.group_ids).to eq [ new_group1.id ]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 7
 
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
@@ -567,7 +567,7 @@
         expect(user.group_ids).to eq [ new_group1.id ]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 4
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['creates']).to include('name', 'contact_email')
@@ -609,7 +609,7 @@
         expect(Cms::Group.unscoped.where(id: group.id).first.active?).to be_falsey
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 1
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -640,7 +640,7 @@
         expect(Cms::Group.unscoped.where(id: group.id).first).to be_nil
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 1
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['id']).to eq group.id.to_s

spec/jobs/chorg/test_runner_spec.rb

@@ -26,7 +26,7 @@
       expect(Cms::Group.where(name: changeset.destinations.first["name"]).first).to be_nil
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 2
       expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
       expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first["name"] })
@@ -72,7 +72,7 @@
         expect(page.contact_link_name).to eq group.contact_link_name
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 2
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -136,7 +136,7 @@
         expect(user2.group_ids).to eq [group2.id]
 
         task.reload
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.entity_logs.count).to eq 5
         expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
         expect(task.entity_logs[0]['creates']).to include('name', 'contact_email')
@@ -181,7 +181,7 @@
       expect(Cms::Group.where(id: group.id).first).not_to be_nil
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 1
       expect(task.entity_logs[0]['model']).to eq 'Cms::Group'
       expect(task.entity_logs[0]['id']).to eq group.id.to_s

spec/jobs/cms/node/generate_job/article_spec.rb

@@ -21,7 +21,7 @@
 
       expect(Cms::Task.count).to eq 2
       Cms::Task.where(site_id: site.id, node_id: nil, name: 'cms:generate_nodes').first.tap do |task|
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.started).not_to be_nil
         expect(task.closed).not_to be_nil
         expect(task.total_count).to eq 0
@@ -58,7 +58,7 @@
         expect(task.state).to eq 'ready'
       end
       Cms::Task.where(site_id: site.id, node_id: node.id, name: 'cms:generate_nodes').first.tap do |task|
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.started).not_to be_nil
         expect(task.closed).not_to be_nil
         expect(task.total_count).to eq 0
@@ -93,7 +93,7 @@
 
       expect(Cms::Task.count).to eq 2
       Cms::Task.where(site_id: site.id, node_id: nil, name: 'cms:generate_nodes').first.tap do |task|
-        expect(task.state).to eq 'stop'
+        expect(task.state).to eq 'completed'
         expect(task.started).not_to be_nil
         expect(task.closed).not_to be_nil
         expect(task.total_count).to eq 0

spec/jobs/cms/node/generate_job/event_spec.rb

@@ -47,7 +47,7 @@
 
         expect(Cms::Task.count).to eq 2
         Cms::Task.where(site_id: site.id, node_id: nil, name: 'cms:generate_nodes').first.tap do |task|
-          expect(task.state).to eq 'stop'
+          expect(task.state).to eq 'completed'
           expect(task.started).not_to be_nil
           expect(task.closed).not_to be_nil
           expect(task.total_count).to eq 0
@@ -94,7 +94,7 @@
         expect { ::Icalendar::Calendar.parse(::File.read("#{node.path}/index.ics")) }.not_to raise_error
 
         Cms::Task.where(site_id: site.id, node_id: node.id, name: 'cms:generate_nodes').first.tap do |task|
-          expect(task.state).to eq 'stop'
+          expect(task.state).to eq 'completed'
         end
       end
     end

spec/jobs/gws/chorg/test_runner_spec.rb

@@ -26,7 +26,7 @@
       expect(Gws::Group.where(name: changeset.destinations.first['name']).first).to be_nil
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 1
       expect(task.entity_logs[0]['model']).to eq 'Gws::Group'
       expect(task.entity_logs[0]['creates']).to include({ 'name' => changeset.destinations.first['name'] })
@@ -57,7 +57,7 @@
       expect(Gws::Group.where(id: group.id).first.name).to eq changeset.sources.first['name']
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 1
       expect(task.entity_logs[0]['model']).to eq 'Gws::Group'
       expect(task.entity_logs[0]['id']).to eq group.id.to_s
@@ -104,7 +104,7 @@
       expect(user2.group_ids).to eq [group2.id]
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 3
       expect(task.entity_logs[0]['model']).to eq 'Gws::Group'
       expect(task.entity_logs[0]['creates']).to include('name')
@@ -141,7 +141,7 @@
       expect(Gws::Group.where(id: group.id).first).not_to be_nil
 
       task.reload
-      expect(task.state).to eq 'stop'
+      expect(task.state).to eq 'completed'
       expect(task.entity_logs.count).to eq 1
       expect(task.entity_logs[0]['model']).to eq 'Gws::Group'
       expect(task.entity_logs[0]['id']).to eq group.id.to_s

spec/jobs/rss/import_weather_xml_all_job_spec.rb

@@ -74,18 +74,18 @@
       expect(SS::Task.where(site_id: site2.id).count).to eq 1
       SS::Task.where(site_id: nil).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml_all"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
       end
       SS::Task.where(site_id: site1.id).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
       end
       SS::Task.where(site_id: site2.id).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
       end
 
       expect(@stab_seed1).to have_been_requested.times(1)
@@ -146,18 +146,18 @@ def gzip(text)
       expect(SS::Task.where(site_id: site2.id).count).to eq 1
       SS::Task.where(site_id: nil).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml_all"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
       end
       SS::Task.where(site_id: site1.id).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
       end
       SS::Task.where(site_id: site2.id).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
       end
 
       expect(@stab_seed1).to have_been_requested.times(1)
@@ -212,18 +212,18 @@ def gzip(text)
       expect(SS::Task.where(site_id: site2.id).count).to eq 1
       SS::Task.where(site_id: nil).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml_all"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
       end
       SS::Task.where(site_id: site1.id).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
       end
       SS::Task.where(site_id: site2.id).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
       end
 
       expect(@stab_seed1).to have_been_requested.times(3)

spec/jobs/rss/import_weather_xml_job_spec.rb

@@ -64,7 +64,7 @@
       expect(Cms::Task.site(site).count).to eq 1
       Cms::Task.site(site).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
@@ -137,7 +137,7 @@
       expect(Cms::Task.site(site).count).to eq 1
       Cms::Task.site(site).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
@@ -228,7 +228,7 @@
       expect(Cms::Task.site(site).where(name: "ezine:deliver").count).to eq 1
       Cms::Task.site(site).where(name: "rss:import_weather_xml").first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
@@ -317,7 +317,7 @@
       expect(Cms::Task.site(site).count).to eq 1
       Cms::Task.site(site).first.tap do |task|
         expect(task.name).to eq "rss:import_weather_xml"
-        expect(task.state).to eq "stop"
+        expect(task.state).to eq "completed"
         expect(task.interrupt).to be_blank
         expect(task.started).to be_present
         expect(task.closed).to be_present
@@ -436,7 +436,7 @@
         expect(Cms::Task.site(site).where(name: "ezine:deliver").count).to eq 1
         Cms::Task.site(site).where(name: "rss:import_weather_xml").first.tap do |task|
           expect(task.name).to eq "rss:import_weather_xml"
-          expect(task.state).to eq "stop"
+          expect(task.state).to eq "completed"
           expect(task.interrupt).to be_blank
           expect(task.started).to be_present
           expect(task.closed).to be_present
@@ -534,7 +534,7 @@
         expect(Cms::Task.site(site).count).to eq 1
         Cms::Task.site(site).first.tap do |task|
           expect(task.name).to eq "rss:import_weather_xml"
-          expect(task.state).to eq "stop"
+          expect(task.state).to eq "completed"
           expect(task.interrupt).to be_blank
           expect(task.started).to be_present
           expect(task.closed).to be_present