kuroko2 0.4.3 → 0.4.4

data/spec/features/job_instance_spec.rb

@@ -21,14 +21,13 @@ RSpec.describe "Launches a job instace and Management job instances on the web c
 
     expect(page).to have_content('Job Definition Details')
     expect(page).to have_content(job_definition.name)
-    click_on 'Launch'
+    find_button('Launch').trigger(:click)
 
     expect(page).to have_selector('#launchAdHocModal .modal-dialog', visible: true)
     within '#launchAdHocModal .modal-dialog' do
-      click_on 'Launch'
+      find_button('Launch').trigger(:click)
     end
 
-    sleep 1
     expect(page).to have_content('Job Instance Details')
     expect(page).to have_selector('#instance-status .label', text: 'WORKING')
 
@@ -58,7 +57,7 @@ RSpec.describe "Launches a job instace and Management job instances on the web c
       visit kuroko2.job_definition_job_instance_path(job_definition, job_definition.job_instances.first)
       expect(page).to have_selector('#instance-status .label', text: 'ERROR')
 
-      click_on('Skip')
+      find_button('Skip').trigger(:click)
 
       sleep(2) # wait for setInterval, 2000
       expect(page).to have_selector('#instance-status .label', text: 'SUCCESS')
@@ -85,7 +84,7 @@ RSpec.describe "Launches a job instace and Management job instances on the web c
       expect(page).to have_selector('#instance-status .label', text: 'ERROR')
 
       within '#instance' do
-        click_on('Cancel')
+        find_link('Cancel').trigger(:click)
       end
 
       sleep(2) # wait for setInterval, 2000

data/spec/requests/api/job_definitions_spec.rb

@@ -0,0 +1,178 @@
+require 'rails_helper'
+
+describe 'job_definitions' do
+  let(:service_name) { :test_client_name }
+  let(:secret_key) { 'secret_key' }
+  let(:env) do
+    {
+      accept: 'application/json',
+      authorization: "Basic #{Base64.encode64("#{service_name}:#{secret_key}")}",
+    }
+  end
+  let(:result) { JSON.parse(response.body) }
+
+  describe 'POST /v1/definitions' do
+
+    let(:user) do
+      create(:user)
+    end
+
+    context 'with valid parameters' do
+      let(:params) do
+        {
+          name: "test",
+          description: "description",
+          script: "noop:",
+          notify_cancellation: 1,
+          hipchat_room: "",
+          hipchat_notify_finished: 1,
+          suspended: false,
+          prevent_multi: 1,
+          hipchat_additional_text: "",
+          text_tags: "",
+          api_allowed: 1,
+          slack_channel: "",
+          webhook_url: "",
+          user_id: [user.id],
+        }
+      end
+
+      it 'creates a new definition' do
+        expect {
+          post "/v1/definitions", params: params, env: env
+        }.to change {
+          Kuroko2::JobDefinition.count
+        }.by(1)
+        expect(result['name']).to eq(params[:name])
+        expect(result['description']).to eq(params[:description])
+        expect(result['script']).to eq(params[:script])
+        expect(response.status).to eq(201)
+      end
+    end
+
+    context 'with invalid parameters' do
+      let(:params) do
+        {
+          description: "description",
+          script: "noop:",
+          notify_cancellation: 1,
+          hipchat_room: "",
+          hipchat_notify_finished: 1,
+          suspended: false,
+          prevent_multi: 1,
+          hipchat_additional_text: "",
+          text_tags: "",
+          api_allowed: 1,
+          slack_channel: "",
+          webhook_url: "",
+          user_id: [user.id],
+        }
+      end
+
+      it 'returns Http Status: 422' do
+        post "/v1/definitions", params: params, env: env
+        expect(response.status).to eq(422)
+      end
+    end
+  end
+
+  describe 'GET /v1/definitions/:id' do
+    let(:definition) do
+      create(:job_definition, script: 'noop:', api_allowed: true)
+    end
+
+    it 'returns a definition' do
+      get "/v1/definitions/#{definition.id}", params: {}, env: env
+      expect(result).to eq(
+        {
+          'id' => definition.id,
+          'name' => definition.name,
+          'description' => definition.description,
+          'script' => definition.script
+        }
+      )
+      expect(response.status).to eq(200)
+    end
+  end
+
+  describe 'PUT /v1/definitions/:id' do
+    let(:definition) do
+      create(:job_definition, script: 'noop:', api_allowed: true)
+    end
+
+    context 'with valid parameters' do
+      let(:params) do
+        {
+          name: "test",
+          description: "description",
+          script: "echo: Hello",
+          notify_cancellation: 1,
+          hipchat_room: "",
+          hipchat_notify_finished: 1,
+          suspended: false,
+          prevent_multi: 1,
+          hipchat_additional_text: "",
+          text_tags: "",
+          api_allowed: 1,
+          slack_channel: "",
+          webhook_url: "",
+        }
+      end
+
+      it 'updates a definition' do
+        put "/v1/definitions/#{definition.id}", params: params, env: env
+        expect(response.status).to eq(204)
+      end
+    end
+
+    context 'with invalid parameters' do
+      let(:params) do
+        {
+          name: "test",
+          description: "description",
+          script: "noop",
+          notify_cancellation: 1,
+          hipchat_room: "",
+          hipchat_notify_finished: 1,
+          suspended: false,
+          prevent_multi: 1,
+          hipchat_additional_text: "",
+          text_tags: "",
+          api_allowed: 1,
+          slack_channel: "",
+          webhook_url: "",
+        }
+      end
+
+      it 'returns Http Status: 422' do
+        put "/v1/definitions/#{definition.id}", params: params, env: env
+        expect(response.status).to eq(422)
+      end
+    end
+
+    context 'with a undefined definition' do
+      let(:params) do
+        {
+          name: "test",
+          description: "description",
+          script: "echo: Hello",
+          notify_cancellation: 1,
+          hipchat_room: "",
+          hipchat_notify_finished: 1,
+          suspended: false,
+          prevent_multi: 1,
+          hipchat_additional_text: "",
+          text_tags: "",
+          api_allowed: 1,
+          slack_channel: "",
+          webhook_url: "",
+        }
+      end
+
+      it 'returns Http Status: 404' do
+        put "/v1/definitions/#{definition.id + 1}", params: params, env: env
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+end

data/spec/workflow/engine_spec.rb

@@ -306,7 +306,9 @@ module Kuroko2::Workflow
 
           FileUtils.touch(tmpfile)
 
+          expect(token.job_instance.retrying?).to be_falsy
           subject.retry(token)
+          expect(token.job_instance.retrying?).to be_truthy
 
           subject.process(token)
           shell.execute

data/spec/workflow/notifier/hipchat_spec.rb

@@ -125,6 +125,17 @@ module Kuroko2::Workflow
       end
     end
 
+    describe '#notify_back_to_normal' do
+      it 'sends back_to_normal message' do
+        expect(hipchat_room_object).to receive(:send) do |_, message, option|
+          expect(message).to include('SUCCESS')
+          expect(option[:color]).to eq('green')
+        end
+
+        notifier.notify_back_to_normal
+      end
+    end
+
     describe '#notify_retrying' do
       context 'with notify_finished' do
         before do

data/spec/workflow/notifier/mail_spec.rb

@@ -67,6 +67,14 @@ module Kuroko2::Workflow
       end
     end
 
+    describe '#notify_back_to_normal' do
+      it 'does not send mail' do
+        expect { notifier.notify_back_to_normal }.not_to change {
+          ActionMailer::Base.deliveries.size
+        }
+      end
+    end
+
     describe '#notify_long_elapsed_time' do
       it 'sends warning mesasge' do
         expect { notifier.notify_long_elapsed_time }.to change {

data/spec/workflow/notifier/slack_spec.rb

@@ -90,6 +90,15 @@ module Kuroko2::Workflow
       end
     end
 
+    describe '#notify_back_to_normal' do
+      it 'sends back_to_normal mesasge' do
+        expect(notifier).to receive(:send_to_slack).
+          with(hash_including(channel: slack_channel)).and_call_original
+
+        notifier.notify_back_to_normal
+      end
+    end
+
     describe '#notify_retrying' do
       context 'with notify_finished' do
         before do

data/spec/workflow/notifier/webhook_spec.rb

@@ -72,6 +72,17 @@ module Kuroko2::Workflow
       end
     end
 
+    describe '#notify_back_to_normal' do
+      it 'sends back_to_normal message' do
+        stub.with { |req|
+          expect(JSON.parse(req.body)).to include("action"=>"notify_back_to_normal")
+        }
+
+        notifier.notify_back_to_normal
+        expect(stub).to have_been_requested
+      end
+    end
+
     describe '#notify_retrying' do
       context 'with notify_finished' do
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuroko2
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Naoto Takai
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -561,6 +561,7 @@ files:
 - app/assets/stylesheets/kuroko2/job_definitions.scss
 - app/assets/stylesheets/kuroko2/users.scss
 - app/controllers/kuroko2/api/application_controller.rb
+- app/controllers/kuroko2/api/job_definitions_controller.rb
 - app/controllers/kuroko2/api/job_instances_controller.rb
 - app/controllers/kuroko2/api/stats_controller.rb
 - app/controllers/kuroko2/application_controller.rb
@@ -582,6 +583,7 @@ files:
 - app/errors/http/bad_request.rb
 - app/errors/http/forbidden.rb
 - app/errors/http/unauthorized.rb
+- app/errors/http/unprocessable_entity.rb
 - app/helpers/kuroko2/application_helper.rb
 - app/helpers/kuroko2/dashboard_helper.rb
 - app/helpers/kuroko2/executions_helper.rb
@@ -600,6 +602,7 @@ files:
 - app/models/concerns/kuroko2/table_name_customizable.rb
 - app/models/kuroko2/admin_assignment.rb
 - app/models/kuroko2/api/application_resource.rb
+- app/models/kuroko2/api/job_definition_resource.rb
 - app/models/kuroko2/api/job_instance_resource.rb
 - app/models/kuroko2/application_record.rb
 - app/models/kuroko2/execution.rb
@@ -693,6 +696,7 @@ files:
 - db/migrate/027_drop_uniq_constraint_user_email.rb
 - db/migrate/028_change_exit_status_to_unsigned_tinyint.rb
 - db/migrate/029_add_execution_id_to_process_signals.rb
+- db/migrate/030_add_notify_back_to_normal.rb
 - lib/autoload/kuroko2/command/executor.rb
 - lib/autoload/kuroko2/command/kill.rb
 - lib/autoload/kuroko2/command/monitor.rb
@@ -1773,6 +1777,7 @@ files:
 - spec/models/user_spec.rb
 - spec/models/worker_spec.rb
 - spec/rails_helper.rb
+- spec/requests/api/job_definitions_spec.rb
 - spec/requests/api/job_instances_spec.rb
 - spec/requests/api/stats_spec.rb
 - spec/return_to_validator_spec.rb
@@ -1822,7 +1827,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Kuroko2 is a web-based job scheduler/workflow manager.
@@ -2852,6 +2857,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/models/worker_spec.rb
 - spec/rails_helper.rb
+- spec/requests/api/job_definitions_spec.rb
 - spec/requests/api/job_instances_spec.rb
 - spec/requests/api/stats_spec.rb
 - spec/return_to_validator_spec.rb