diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-13 17:12:31 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-28 18:17:44 -0500 |
| commit | 70b05a83772abc59b3c914c84bc4d2c07749884d (patch) | |
| tree | 44dfcd05aa111d36e5db08777611856a7c5eb99a /spec/views | |
| parent | 92f87f6d8bdd4424334131132394df343c006a63 (diff) | |
| download | gitlab-ce-70b05a83772abc59b3c914c84bc4d2c07749884d.tar.gz | |
Split up MergeRequestsControllerdm-merge-request-creations-controller
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/merge_requests/_commits.html.haml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb (renamed from spec/views/projects/merge_requests/_new_submit.html.haml_spec.rb) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb index 4052dbf8df3..3e17fe2104b 100644 --- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'projects/merge_requests/show/_commits.html.haml' do +describe 'projects/merge_requests/_commits.html.haml' do include Devise::Test::ControllerHelpers let(:user) { create(:user) } diff --git a/spec/views/projects/merge_requests/_new_submit.html.haml_spec.rb b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb index 4f698a34ab5..1e9bdf9108f 100644 --- a/spec/views/projects/merge_requests/_new_submit.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'projects/merge_requests/_new_submit.html.haml', :view do +describe 'projects/merge_requests/creations/_new_submit.html.haml', :view do let(:merge_request) { create(:merge_request) } let!(:pipeline) { create(:ci_empty_pipeline) } |