Merge branch 'qa-staging-59-fix-project-template-spec' into 'master'

Fix project template spec

Closes gitlab-org/quality/staging#59

See merge request gitlab-org/gitlab-ee!14430

qa/qa/page/settings/common.rb

@@ -11,7 +11,7 @@ module QA
           within_element(element_name) do
             # Because it is possible to click the button before the JS toggle code is bound
             wait(reload: false) do
-              click_button 'Expand' unless first('button', text: 'Collapse')
+              click_button 'Expand' unless has_css?('button', text: 'Collapse')
 
               has_content?('Collapse')
             end

qa/qa/specs/features/browser_ui/1_manage/project/ee_project_templates_spec.rb

@@ -38,8 +38,7 @@ module QA
         end
       end
 
-      # https://gitlab.com/gitlab-org/quality/staging/issues/59
-      context 'instance level', :quarantine do
+      context 'instance level' do
         before do
           # Log out if already logged in
           Page::Main::Menu.perform do |menu|
@@ -83,6 +82,12 @@ module QA
 
       context 'group level' do
         before do
+          # Log out if already logged in. This is necessary because
+          # a previous test might have logged in as admin
+          Page::Main::Menu.perform do |menu|
+            menu.sign_out if menu.has_personal_area?(wait: 0)
+          end
+
           Runtime::Browser.visit(:gitlab, Page::Main::Login)
           Page::Main::Login.perform(&:sign_in_using_credentials)