diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-12 09:23:21 +0200 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-12 09:23:21 +0200 |
commit | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (patch) | |
tree | b39508df518df88682703b4525f6895113ec4a8a /spec/controllers/projects/issues_controller_spec.rb | |
parent | 2bbe781d8b45fb9677f5fbe60cf86b2452ef3af4 (diff) | |
download | gitlab-ce-7a4e7ad04e1fc96953d9159e8e1a2208990d34f7.tar.gz |
Fix tests and wrong choices during merge
Diffstat (limited to 'spec/controllers/projects/issues_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 706f538f262..13d9a498789 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -258,8 +258,10 @@ describe Projects::IssuesController do end it "toggles the award emoji" do - expect { post(:toggle_award_emoji, namespace_id: project.namespace.path, - project_id: project.path, id: issue.iid, name: "thumbsup") }.to change { AwardEmoji.count }.by(1) + expect do + post(:toggle_award_emoji, namespace_id: project.namespace.path, + project_id: project.path, id: issue.iid, name: "thumbsup") + end.to change { AwardEmoji.count }.by(1) expect(response.status).to eq(200) end |