Add latest changes from gitlab-org/gitlab@master

4 files changed, 12 insertions, 7 deletions

diff --git a/qa/qa/page/project/wiki/edit.rb b/qa/qa/page/project/wiki/edit.rb
index f6edc28c41a..bdc1cda8950 100644
--- a/qa/qa/page/project/wiki/edit.rb
+++ b/qa/qa/page/project/wiki/edit.rb
@@ -5,7 +5,7 @@ module QA
     module Project
       module Wiki
         class Edit < Page::Base
-          view 'app/views/projects/wikis/_main_links.html.haml' do
+          view 'app/views/shared/wiki/_main_links.html.haml' do
             element :new_page_link, 'New page' # rubocop:disable QA/ElementWithPattern
             element :page_history_link, 'Page history' # rubocop:disable QA/ElementWithPattern
             element :edit_page_link, 'Edit' # rubocop:disable QA/ElementWithPattern
diff --git a/qa/qa/page/project/wiki/new.rb b/qa/qa/page/project/wiki/new.rb
index 792eba4bab7..abad499d700 100644
--- a/qa/qa/page/project/wiki/new.rb
+++ b/qa/qa/page/project/wiki/new.rb
@@ -7,7 +7,7 @@ module QA
         class New < Page::Base
           include Component::LazyLoader
 
-          view 'app/views/projects/wikis/_form.html.haml' do
+          view 'app/views/projects/wiki_pages/_form.html.haml' do
             element :wiki_title_textbox
             element :wiki_content_textarea
             element :wiki_message_textbox
diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb
index 44619d177b1..c6b34ddc317 100644
--- a/qa/qa/page/project/wiki/show.rb
+++ b/qa/qa/page/project/wiki/show.rb
@@ -7,11 +7,11 @@ module QA
         class Show < Page::Base
           include Page::Component::LegacyClonePanel
 
-          view 'app/views/projects/wikis/pages.html.haml' do
+          view 'app/views/shared/wiki/_page_listing.html.haml' do
             element :clone_repository_link, 'Clone repository' # rubocop:disable QA/ElementWithPattern
           end
 
-          view 'app/views/projects/wikis/show.html.haml' do
+          view 'app/views/projects/wiki_pages/show.html.haml' do
             element :wiki_page_content
           end
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb
index 2c3f2c86c23..b996492ce08 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb
@@ -13,7 +13,7 @@ module QA
           resource.message = 'Update home'
         end
 
-        validate_content('My First Wiki Content')
+        validate_created('My First Wiki Content')
 
         Page::Project::Wiki::Edit.perform(&:click_edit)
         Page::Project::Wiki::New.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
@@ -21,7 +21,7 @@ module QA
           page.save_changes
         end
 
-        validate_content('My Second Wiki Content')
+        validate_edited('My Second Wiki Content')
 
         Resource::Repository::WikiPush.fabricate! do |push|
           push.wiki = wiki
@@ -34,7 +34,12 @@ module QA
         expect(page).to have_content('My Third Wiki Content')
       end
 
-      def validate_content(content)
+      def validate_created(content)
+        expect(page).to have_content('Wiki was successfully created')
+        expect(page).to have_content(/#{content}/)
+      end
+
+      def validate_edited(content)
         expect(page).to have_content('Wiki was successfully updated')
         expect(page).to have_content(/#{content}/)
       end