Fix tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 5 insertions, 11 deletions

diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb
index 780bc8e4130..85c0226ccab 100644
--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -1,5 +1,5 @@
 module Issues
-  class CloseService < BaseService
+  class CloseService < Issues::BaseService
     def execute(issue, commit = nil)
       if issue.close
         notification_service.close_issue(issue, current_user)
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 8008086dae9..d6137833bb9 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -1,5 +1,5 @@
 module Issues
-  class CreateService < BaseService
+  class CreateService < Issues::BaseService
     def execute
       issue = project.issues.new(params)
       issue.author = current_user
diff --git a/app/services/issues/reopen_service.rb b/app/services/issues/reopen_service.rb
index e1e5a97229c..a931398aff6 100644
--- a/app/services/issues/reopen_service.rb
+++ b/app/services/issues/reopen_service.rb
@@ -1,5 +1,5 @@
 module Issues
-  class ReopenService < BaseService
+  class ReopenService < Issues::BaseService
     def execute(issue)
       if issue.reopen
         event_service.reopen_issue(issue, current_user)
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 06c38d80740..b562c401fd4 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -1,5 +1,5 @@
 module Issues
-  class UpdateService < BaseService
+  class UpdateService < Issues::BaseService
     def execute(issue)
       state = params.delete('state_event')
 
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 90738c681fa..6b89f213bec 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -170,16 +170,10 @@ describe GitPushService do
       Issue.find(issue.id).should be_closed
     end
 
-    it "passes the closing commit as a thread-local" do
-      service.execute(project, user, @oldrev, @newrev, @ref)
-
-      Thread.current[:current_commit].should == closing_commit
-    end
-
     it "doesn't create cross-reference notes for a closing reference" do
       expect {
         service.execute(project, user, @oldrev, @newrev, @ref)
-      }.not_to change { Note.where(project_id: project.id, system: true).count }
+      }.not_to change { Note.where(project_id: project.id, system: true, commit_id: closing_commit.id).count }
     end
 
     it "doesn't close issues when pushed to non-default branches" do