summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-02-15 14:51:40 +0100
committerJarka Kadlecova <jarka@gitlab.com>2017-02-16 13:27:31 +0100
commitd89f4d73b9422aac15ee708ca72405f399c7dfa6 (patch)
treedc1a1a5909618618ed8d264608f97a6d73afb30d /spec/controllers/projects
parent88132258d66ca955b0e9bd93d4ee8dc12cc54537 (diff)
downloadgitlab-ce-d89f4d73b9422aac15ee708ca72405f399c7dfa6.tar.gz
Fix error in MR widget after /merge slash command
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index bfd134e406e..f84f922ba5e 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1143,15 +1143,15 @@ describe Projects::MergeRequestsController do
end
end
- context 'when no special status for MR' do
+ context 'when MR does not have special state' do
let(:merge_request) { create(:merge_request, source_project: project) }
it 'returns an OK response' do
expect(response).to have_http_status(:ok)
end
- it 'sets status to nil' do
- expect(assigns(:status)).to be_nil
+ it 'sets status to success' do
+ expect(assigns(:status)).to eq(:success)
expect(response).to render_template('merge')
end
end