Merge branch 'qa-wiki-ssh-spec' into 'master'

CE backport of E2E Test wiki SSH push to Geo primary node

See merge request gitlab-org/gitlab-ce!32885

2 files changed, 18 insertions, 0 deletions

diff --git a/qa/qa/page/profile/ssh_keys.rb b/qa/qa/page/profile/ssh_keys.rb
index ce1813b14d0..082202f91ca 100644
--- a/qa/qa/page/profile/ssh_keys.rb
+++ b/qa/qa/page/profile/ssh_keys.rb
@@ -14,6 +14,10 @@ module QA
           element :delete_key_button
         end
 
+        view 'app/views/profiles/keys/_key_table.html.haml' do
+          element :ssh_keys_list
+        end
+
         def add_key(public_key, title)
           fill_element :key_public_key_field, public_key
           fill_element :key_title_field, title
@@ -28,6 +32,10 @@ module QA
             click_element :delete_key_button
           end
         end
+
+        def keys_list
+          find_element(:ssh_keys_list).text
+        end
       end
     end
   end
diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb
index f79ad510084..44619d177b1 100644
--- a/qa/qa/page/project/wiki/show.rb
+++ b/qa/qa/page/project/wiki/show.rb
@@ -11,11 +11,21 @@ module QA
             element :clone_repository_link, 'Clone repository' # rubocop:disable QA/ElementWithPattern
           end
 
+          view 'app/views/projects/wikis/show.html.haml' do
+            element :wiki_page_content
+          end
+
           def click_clone_repository
             click_on 'Clone repository'
           end
+
+          def wiki_text
+            find_element(:wiki_page_content).text
+          end
         end
       end
     end
   end
 end
+
+QA::Page::Project::Wiki::Show.prepend_if_ee('QA::EE::Page::Project::Wiki::Show')