diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-10 09:14:26 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-10 09:14:26 -0700 |
| commit | f77918c3afa25f73a18e1fb2963adb3d833771e3 (patch) | |
| tree | 776687b7484c016ebc2b1c3f0cf883c457498ae8 | |
| parent | 4fcd89fe7fb44da5c9bbdcca89bfbbffa5d0b032 (diff) | |
| parent | de6db604774b5d25405f9a8d358050f2da5b21a4 (diff) | |
| download | gitlab-ce-f77918c3afa25f73a18e1fb2963adb3d833771e3.tar.gz | |
Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name
Fix overlapping test case names.
| -rw-r--r-- | spec/controllers/merge_requests_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/merge_requests_controller_spec.rb b/spec/controllers/merge_requests_controller_spec.rb index e8dd9bf995c..796de23bfe3 100644 --- a/spec/controllers/merge_requests_controller_spec.rb +++ b/spec/controllers/merge_requests_controller_spec.rb @@ -12,7 +12,7 @@ describe MergeRequestsController do end describe "#show" do - shared_examples "export as" do |format| + shared_examples "export merge as" do |format| it "should generally work" do get :show, project_id: project.code, id: merge_request.id, format: format @@ -44,7 +44,7 @@ describe MergeRequestsController do end describe "as diff" do - include_examples "export as", :diff + include_examples "export merge as", :diff let(:format) { :diff } it "should really only be a git diff" do @@ -55,7 +55,7 @@ describe MergeRequestsController do end describe "as patch" do - include_examples "export as", :patch + include_examples "export merge as", :patch let(:format) { :patch } it "should really be a git email patch with commit" do |
