diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
| commit | 742e6eeed221489d5f35bdfde2e6ce55db75d25f (patch) | |
| tree | 710c01fbd18e81a7590819161434e19855e35a97 /features/steps/project/issues | |
| parent | 7a5072c5a8f03cd7342a5f8e74e1fde0250ce360 (diff) | |
| parent | bbf9953b99d59801c72dd7b9550ee149ca77bfcf (diff) | |
| download | gitlab-ce-742e6eeed221489d5f35bdfde2e6ce55db75d25f.tar.gz | |
Merge branch 'upstream-master' into markdown-preview
Conflicts:
spec/routing/project_routing_spec.rb
Diffstat (limited to 'features/steps/project/issues')
| -rw-r--r-- | features/steps/project/issues/milestones.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/issues/milestones.rb b/features/steps/project/issues/milestones.rb index 89d7af3c9ee..cce87a6d981 100644 --- a/features/steps/project/issues/milestones.rb +++ b/features/steps/project/issues/milestones.rb @@ -8,7 +8,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps milestone = @project.milestones.find_by(title: "v2.2") page.should have_content(milestone.title[0..10]) page.should have_content(milestone.expires_at) - page.should have_content("Browse Issues") + page.should have_content("Issues") end step 'I click link "v2.2"' do @@ -28,7 +28,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps milestone = @project.milestones.find_by(title: "v2.3") page.should have_content(milestone.title[0..10]) page.should have_content(milestone.expires_at) - page.should have_content("Browse Issues") + page.should have_content("Issues") end step 'project "Shop" has milestone "v2.2"' do |