Commit f77918c3afa25f73a18e1fb2963adb3d833771e3
Exists in
master
and in
4 other branches
Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name
Fix overlapping test case names.
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
spec/controllers/merge_requests_controller_spec.rb
| @@ -12,7 +12,7 @@ describe MergeRequestsController do | @@ -12,7 +12,7 @@ describe MergeRequestsController do | ||
| 12 | end | 12 | end |
| 13 | 13 | ||
| 14 | describe "#show" do | 14 | describe "#show" do |
| 15 | - shared_examples "export as" do |format| | 15 | + shared_examples "export merge as" do |format| |
| 16 | it "should generally work" do | 16 | it "should generally work" do |
| 17 | get :show, project_id: project.code, id: merge_request.id, format: format | 17 | get :show, project_id: project.code, id: merge_request.id, format: format |
| 18 | 18 | ||
| @@ -44,7 +44,7 @@ describe MergeRequestsController do | @@ -44,7 +44,7 @@ describe MergeRequestsController do | ||
| 44 | end | 44 | end |
| 45 | 45 | ||
| 46 | describe "as diff" do | 46 | describe "as diff" do |
| 47 | - include_examples "export as", :diff | 47 | + include_examples "export merge as", :diff |
| 48 | let(:format) { :diff } | 48 | let(:format) { :diff } |
| 49 | 49 | ||
| 50 | it "should really only be a git diff" do | 50 | it "should really only be a git diff" do |
| @@ -55,7 +55,7 @@ describe MergeRequestsController do | @@ -55,7 +55,7 @@ describe MergeRequestsController do | ||
| 55 | end | 55 | end |
| 56 | 56 | ||
| 57 | describe "as patch" do | 57 | describe "as patch" do |
| 58 | - include_examples "export as", :patch | 58 | + include_examples "export merge as", :patch |
| 59 | let(:format) { :patch } | 59 | let(:format) { :patch } |
| 60 | 60 | ||
| 61 | it "should really be a git email patch with commit" do | 61 | it "should really be a git email patch with commit" do |