diff options
author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-01 11:23:09 +0200 |
---|---|---|
committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-01 12:10:08 +0200 |
commit | 91a7b9333b660abc866e52e1a614151cb529413d (patch) | |
tree | c7ee15fd37e703229f6f197207304479251b5856 /spec/controllers | |
parent | cbd7801b3d1d435a95ec70032c5acc9df33b0337 (diff) | |
download | gitlab-ce-91a7b9333b660abc866e52e1a614151cb529413d.tar.gz |
Incorportate feedback
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/groups_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 82b25702172..cd98fecd0c7 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -33,7 +33,7 @@ describe GroupsController do before do create_list(:award_emoji, 3, awardable: issue_2) create_list(:award_emoji, 2, awardable: issue_1) - create_list(:award_emoji, 2, awardable: issue_2, name: "thumbsdown") + create_list(:award_emoji, 2, :downvote, awardable: issue_2,) sign_in(user) end @@ -58,7 +58,7 @@ describe GroupsController do before do create_list(:award_emoji, 3, awardable: merge_request_2) create_list(:award_emoji, 2, awardable: merge_request_1) - create_list(:award_emoji, 2, awardable: merge_request_2, name: "thumbsdown") + create_list(:award_emoji, 2, :downvote, awardable: merge_request_2) sign_in(user) end diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 849816b9caf..78be7e3dc35 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -258,10 +258,10 @@ describe Projects::IssuesController do end it "toggles the award emoji" do - expect do + 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) + project_id: project.path, id: issue.iid, name: "thumbsup") + end.to change { issue.award_emoji.count }.by(1) expect(response.status).to eq(200) end |