diff options
author | Douglas Huff <dhuff@jrbobdobbs.org> | 2013-04-07 13:58:25 -0700 |
---|---|---|
committer | Douglas Huff <dhuff@jrbobdobbs.org> | 2013-04-07 13:58:25 -0700 |
commit | de6db604774b5d25405f9a8d358050f2da5b21a4 (patch) | |
tree | f6b1edb33683905bd858a303f4e768230583bc34 /spec/controllers | |
parent | 97de212e80737a608d939f648d959671fb0a0142 (diff) | |
download | gitlab-ce-de6db604774b5d25405f9a8d358050f2da5b21a4.tar.gz |
Fix overlapping test case names.
Diffstat (limited to 'spec/controllers')
-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 |