Commit f77918c3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name

Fix overlapping test case names.
parents 4fcd89fe de6db604
...@@ -12,7 +12,7 @@ describe MergeRequestsController do ...@@ -12,7 +12,7 @@ describe MergeRequestsController do
end end
describe "#show" do describe "#show" do
shared_examples "export as" do |format| shared_examples "export merge as" do |format|
it "should generally work" do it "should generally work" do
get :show, project_id: project.code, id: merge_request.id, format: format get :show, project_id: project.code, id: merge_request.id, format: format
...@@ -44,7 +44,7 @@ describe MergeRequestsController do ...@@ -44,7 +44,7 @@ describe MergeRequestsController do
end end
describe "as diff" do describe "as diff" do
include_examples "export as", :diff include_examples "export merge as", :diff
let(:format) { :diff } let(:format) { :diff }
it "should really only be a git diff" do it "should really only be a git diff" do
...@@ -55,7 +55,7 @@ describe MergeRequestsController do ...@@ -55,7 +55,7 @@ describe MergeRequestsController do
end end
describe "as patch" do describe "as patch" do
include_examples "export as", :patch include_examples "export merge as", :patch
let(:format) { :patch } let(:format) { :patch }
it "should really be a git email patch with commit" do it "should really be a git email patch with commit" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment