1 files changed, 39 insertions, 21 deletions
diff --git a/spec/features/projects/wiki/markdown_preview_spec.rb b/spec/features/projects/wiki/markdown_preview_spec.rb
index a1c386ddc18..43d8b45669e 100644
--- a/spec/features/projects/wiki/markdown_preview_spec.rb
+++ b/spec/features/projects/wiki/markdown_preview_spec.rb
@@ -24,12 +24,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
   context "while creating a new wiki page" do
     context "when there are no spaces or hyphens in the page name" do
       it "rewrites relative links as expected" do
-        click_link 'New Page'
-        fill_in :new_wiki_path, with: 'a/b/c/d'
-        click_button 'Create Page'
+        click_link 'New page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a/b/c/d'
+          click_button 'Create page'
+        end
 
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -42,12 +46,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
 
     context "when there are spaces in the page name" do
       it "rewrites relative links as expected" do
-        click_link 'New Page'
-        fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
-        click_button 'Create Page'
+        click_link 'New page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a page/b page/c page/d page'
+          click_button 'Create page'
+        end
 
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -60,12 +68,16 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
 
     context "when there are hyphens in the page name" do
       it "rewrites relative links as expected" do
-        click_link 'New Page'
-        fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
-        click_button 'Create Page'
-
-        fill_in :wiki_content, with: wiki_content
-        click_on "Preview"
+        click_link 'New page'
+        page.within '#modal-new-wiki' do
+          fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
+          click_button 'Create page'
+        end
+        
+        page.within '.wiki-form' do
+          fill_in :wiki_content, with: wiki_content
+          click_on "Preview"
+        end
 
         expect(page).to have_content("regular link")
 
@@ -79,11 +91,17 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
 
   context "while editing a wiki page" do
     def create_wiki_page(path)
-      click_link 'New Page'
-      fill_in :new_wiki_path, with: path
-      click_button 'Create Page'
-      fill_in :wiki_content, with: 'content'
-      click_on "Create page"
+      click_link 'New page'
+
+      page.within '#modal-new-wiki' do
+        fill_in :new_wiki_path, with: path
+        click_button 'Create page'
+      end
+
+      page.within '.wiki-form' do
+        fill_in :wiki_content, with: 'content'
+        click_on "Create page"
+      end
     end
 
     context "when there are no spaces or hyphens in the page name" do