diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-24 16:54:32 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 16:54:39 +0300 |
| commit | 0283fff5914f74d9435ab2097b2770dfdf635941 (patch) | |
| tree | 8bcf91cb5639d3d06a15cabb1d08e408b4ba9d43 /features/steps/groups.rb | |
| parent | aba12515942d588f1a0aa0b32cc16837e5d04fef (diff) | |
| parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) | |
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
Diffstat (limited to 'features/steps/groups.rb')
| -rw-r--r-- | features/steps/groups.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/groups.rb b/features/steps/groups.rb index 0a9b4ccba53..dffa4d103e5 100644 --- a/features/steps/groups.rb +++ b/features/steps/groups.rb @@ -194,8 +194,8 @@ class Spinach::Features::Groups < Spinach::FeatureSteps step 'I should see group milestone with all issues and MRs assigned to that milestone' do page.should have_content('Milestone GL-113') page.should have_content('Progress: 0 closed – 4 open') - page.should have_link(@issue1.title, href: project_issue_path(@project1, @issue1)) - page.should have_link(@mr3.title, href: project_merge_request_path(@project3, @mr3)) + page.should have_link(@issue1.title, href: namespace_project_issue_path(@project1.namespace, @project1, @issue1)) + page.should have_link(@mr3.title, href: namespace_project_merge_request_path(@project3.namespace, @project3, @mr3)) end protected |