fix tests broken by new wiki page design

2 files changed, 9 insertions, 13 deletions

diff --git a/features/steps/project/source/markdown_render.rb b/features/steps/project/source/markdown_render.rb
index 2134dae168a..dee6a8a5558 100644
--- a/features/steps/project/source/markdown_render.rb
+++ b/features/steps/project/source/markdown_render.rb
@@ -241,7 +241,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
     page.within(:css, ".nav-text") do
       expect(page).to have_content "Test"
-      expect(page).to have_content "Edit Page"
+      expect(page).to have_content "Create Page"
     end
   end
 
@@ -258,7 +258,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
     expect(current_path).to eq namespace_project_wiki_path(@project.namespace, @project, "api")
 
     page.within(:css, ".nav-text") do
-      expect(page).to have_content "Edit"
+      expect(page).to have_content "Create"
       expect(page).to have_content "Api"
     end
   end
@@ -271,7 +271,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
     expect(current_path).to eq namespace_project_wiki_path(@project.namespace, @project, "raketasks")
 
     page.within(:css, ".nav-text") do
-      expect(page).to have_content "Edit"
+      expect(page).to have_content "Create"
       expect(page).to have_content "Rake"
     end
   end
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb
index 07a955b1a14..4cb0a21fbb4 100644
--- a/features/steps/project/wiki.rb
+++ b/features/steps/project/wiki.rb
@@ -29,7 +29,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     expect(page).to have_content "link test"
 
     click_link "link test"
-    expect(page).to have_content "Edit Page"
+    expect(page).to have_content "Create Page"
   end
 
   step 'I have an existing Wiki page' do
@@ -80,13 +80,9 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
     expect(page).to have_content "Page was successfully deleted"
   end
 
-  step 'I click on the "Pages" button' do
-    click_on "Pages"
-  end
-
   step 'I should see the existing page in the pages list' do
     expect(page).to have_content current_user.name
-    expect(page).to have_content @page.title
+    expect(find('.wiki-pages')).to have_content @page.title.capitalize
   end
 
   step 'I have an existing Wiki page with images linked on page' do
@@ -125,7 +121,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   step 'I should see the new wiki page form' do
     expect(current_path).to match('wikis/image.jpg')
     expect(page).to have_content('New Wiki Page')
-    expect(page).to have_content('Edit Page')
+    expect(page).to have_content('Create Page')
   end
 
   step 'I create a New page with paths' do
@@ -142,8 +138,8 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   end
 
   step 'I edit the Wiki page with a path' do
-    expect(page).to have_content('three')
-    click_on 'three'
+    expect(find('.wiki-pages')).to have_content('Three')
+    click_on 'Three'
     expect(find('.nav-text')).to have_content('Three')
     click_on 'Edit'
   end
@@ -157,7 +153,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
   end
 
   step 'I view the page history of a Wiki page that has a path' do
-    click_on 'three'
+    click_on 'Three'
     click_on 'Page History'
   end