From 3bff8da8c1e3223e81bccd5343902b840f005fcf Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 4 May 2017 12:37:54 +0200
Subject: [PATCH] fix service spec
---
app/models/service.rb | 2 +-
spec/models/service_spec.rb | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/models/service.rb b/app/models/service.rb
index dea22fd96a7..18c046aff54 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -257,7 +257,7 @@ class Service < ActiveRecord::Base
def update_and_propagate(service_params)
return false unless update_attributes(service_params)
- if service_params[:active] == 1
+ if service_params[:active]
PropagateProjectServiceWorker.perform_async(service_params[:id])
end
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index e9acbb81ad9..7a5fb509bf5 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -256,26 +256,27 @@ describe Service, models: true do
end
describe "#update_and_propagate" do
+ let(:project) { create(:empty_project) }
let!(:service) do
RedmineService.new(
project: project,
active: false,
properties: {
- project_url: 'http://redmine/projects/project_name_in_redmine',
- issues_url: "http://redmine/#{project.id}/project_name_in_redmine/:id",
- new_issue_url: 'http://redmine/projects/project_name_in_redmine/issues/new'
+ project_url: 'http://abc',
+ issues_url: 'http://abc',
+ new_issue_url: 'http://abc'
}
)
end
it 'updates the service params successfully and calls the propagation worker' do
- expect(PropagateProjectServiceWorker).to receve(:perform_async)
+ expect(PropagateProjectServiceWorker).to receive(:perform_async)
expect(service.update_and_propagate(active: true)).to be true
end
it 'updates the service params successfully' do
- expect(PropagateProjectServiceWorker).not_to receve(:perform_asyncs)
+ expect(PropagateProjectServiceWorker).not_to receive(:perform_async)
expect(service.update_and_propagate(properties: {})).to be true
end
--
GitLab