summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-02 19:55:23 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-02 19:55:23 +0300
commit49f977d675b44b6aae0f491fbbf86dd1ee05eb64 (patch)
treeccb0b086dc0885f35f880b2fc3c20e3d1a7e63c7 /spec
parent928fbeeec057692d923146994c4b8dff57024417 (diff)
downloadgitlab-ce-49f977d675b44b6aae0f491fbbf86dd1ee05eb64.tar.gz
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r--spec/services/git_push_service_spec.rb8
1 files changed, 1 insertions, 7 deletions
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