diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 16:43:09 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 16:43:09 +0300 |
| commit | cc9b5c49d1de2a9e1e90895700376793b9d614f6 (patch) | |
| tree | 3e5c1924e14cfa4acc9daddc1f1e7c535e25605f /spec/requests | |
| parent | bcb07929fe7d79be4eab86c7eb0cb0409a736efc (diff) | |
| parent | 967214b2eccc473eaeab45a22e496fefbcfe0841 (diff) | |
Merge branch 'revert-mr-state-names'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/merge_requests.rb
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 70dd8049b12..2887221fb46 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -49,9 +49,8 @@ describe API::API, api: true do get api("/projects/#{project.id}/merge_requests?state=closed", user) expect(response.status).to eq(200) expect(json_response).to be_an Array - expect(json_response.length).to eq(2) - expect(json_response.second['title']).to eq(merge_request_closed.title) - expect(json_response.first['title']).to eq(merge_request_merged.title) + expect(json_response.length).to eq(1) + expect(json_response.first['title']).to eq(merge_request_closed.title) end it "should return an array of merged merge_requests" do |