Download as
Browse Code »

Commit f77918c3afa25f73a18e1fb2963adb3d833771e3

Authored by Dmitriy Zaporozhets
2 parents 4fcd89fe de6db604
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @f77918c
... ... @@ -12,7 +12,7 @@ describe MergeRequestsController do
12 12 end
13 13  
14 14 describe "#show" do
15   - shared_examples "export as" do |format|
  15 + shared_examples "export merge as" do |format|
16 16 it "should generally work" do
17 17 get :show, project_id: project.code, id: merge_request.id, format: format
18 18  
... ... @@ -44,7 +44,7 @@ describe MergeRequestsController do
44 44 end
45 45  
46 46 describe "as diff" do
47   - include_examples "export as", :diff
  47 + include_examples "export merge as", :diff
48 48 let(:format) { :diff }
49 49  
50 50 it "should really only be a git diff" do
... ... @@ -55,7 +55,7 @@ describe MergeRequestsController do
55 55 end
56 56  
57 57 describe "as patch" do
58   - include_examples "export as", :patch
  58 + include_examples "export merge as", :patch
59 59 let(:format) { :patch }
60 60  
61 61 it "should really be a git email patch with commit" do
... ...