diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-01-24 21:02:58 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-14 21:09:23 +0300 |
| commit | 76aad9b76ed756ca9ba2cbcdb399c815e542b3ae (patch) | |
| tree | 7226e0ce64796abbf4848582baed8d173ddecd14 /spec/features/notes_on_merge_requests_spec.rb | |
| parent | 5725b6daad2f403f13112cfcafa5b45ac126c0ca (diff) | |
Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 7790d0ecd73..5c8b1f5be36 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -12,7 +12,7 @@ describe 'Comments' do before do login_as :admin - visit project_merge_request_path(project, merge_request) + visit namespace_project_merge_request_path(project.namespace, project, merge_request) end subject { page } @@ -136,7 +136,7 @@ describe 'Comments' do before do login_as :admin - visit diffs_project_merge_request_path(project, merge_request) + visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) end subject { page } |