Fix tests

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

Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 928fbeee
Showing 5 changed files with 5 additions and 11 deletions Show diff stats
app/services/issues/close_service.rb
app/services/issues/create_service.rb
app/services/issues/reopen_service.rb
app/services/issues/update_service.rb
spec/services/git_push_service_spec.rb
 module Issues
-  class CloseService < BaseService
+  class CloseService < Issues::BaseService
     def execute(issue, commit = nil)
       if issue.close
         notification_service.close_issue(issue, current_user)
 module Issues
-  class CreateService < BaseService
+  class CreateService < Issues::BaseService
     def execute
       issue = project.issues.new(params)
       issue.author = current_user
 module Issues
-  class ReopenService < BaseService
+  class ReopenService < Issues::BaseService
     def execute(issue)
       if issue.reopen
         event_service.reopen_issue(issue, current_user)
 module Issues
-  class UpdateService < BaseService
+  class UpdateService < Issues::BaseService
     def execute(issue)
       state = params.delete('state_event')
  
@@ -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
1	1	module Issues
2		- class CloseService < BaseService
	2	+ class CloseService < Issues::BaseService
3	3	def execute(issue, commit = nil)
4	4	if issue.close
5	5	notification_service.close_issue(issue, current_user)
...	...
1	1	module Issues
2		- class CreateService < BaseService
	2	+ class CreateService < Issues::BaseService
3	3	def execute
4	4	issue = project.issues.new(params)
5	5	issue.author = current_user
...	...
1	1	module Issues
2		- class ReopenService < BaseService
	2	+ class ReopenService < Issues::BaseService
3	3	def execute(issue)
4	4	if issue.reopen
5	5	event_service.reopen_issue(issue, current_user)
...	...
1	1	module Issues
2		- class UpdateService < BaseService
	2	+ class UpdateService < Issues::BaseService
3	3	def execute(issue)
4	4	state = params.delete('state_event')
5	5
...	...
...	...	@@ -170,16 +170,10 @@ describe GitPushService do
170	170	Issue.find(issue.id).should be_closed
171	171	end
172	172
173		- it "passes the closing commit as a thread-local" do
174		- service.execute(project, user, @oldrev, @newrev, @ref)
175		-
176		- Thread.current[:current_commit].should == closing_commit
177		- end
178		-
179	173	it "doesn't create cross-reference notes for a closing reference" do
180	174	expect {
181	175	service.execute(project, user, @oldrev, @newrev, @ref)
182		- }.not_to change { Note.where(project_id: project.id, system: true).count }
	176	+ }.not_to change { Note.where(project_id: project.id, system: true, commit_id: closing_commit.id).count }
183	177	end
184	178
185	179	it "doesn't close issues when pushed to non-default branches" do
...	...