Merge branch 'resolve-new-qa-differences' into 'master'

Fix CE to EE differences in the qa/ directory

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

qa/qa/page/admin/menu.rb

@@ -83,3 +83,5 @@ module QA
     end
   end
 end
+
+QA::Page::Admin::Menu.prepend_if_ee('QA::EE::Page::Admin::Menu')

qa/qa/page/dashboard/projects.rb

@@ -29,3 +29,5 @@ module QA
     end
   end
 end
+
+QA::Page::Dashboard::Projects.prepend_if_ee('QA::EE::Page::Dashboard::Projects')

qa/qa/page/file/show.rb

@@ -32,3 +32,5 @@ module QA
     end
   end
 end
+
+QA::Page::File::Show.prepend_if_ee('QA::EE::Page::File::Show')

qa/qa/page/merge_request/show.rb

@@ -187,3 +187,5 @@ module QA
     end
   end
 end
+
+QA::Page::MergeRequest::Show.prepend_if_ee('QA::EE::Page::MergeRequest::Show')

qa/qa/page/profile/menu.rb

@@ -34,3 +34,5 @@ module QA
     end
   end
 end
+
+QA::Page::Profile::Menu.prepend_if_ee('QA::EE::Page::Profile::Menu')

qa/qa/page/project/issue/index.rb

@@ -25,3 +25,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Issue::Index.prepend_if_ee('QA::EE::Page::Project::Issue::Index')

qa/qa/page/project/issue/show.rb

@@ -112,3 +112,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Issue::Show.prepend_if_ee('QA::EE::Page::Project::Issue::Show')

qa/qa/page/project/menu.rb

@@ -39,3 +39,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Menu.prepend_if_ee('QA::EE::Page::Project::SubMenus::SecurityCompliance')

qa/qa/page/project/new.rb

@@ -73,3 +73,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::New.prepend_if_ee('QA::EE::Page::Project::New')

qa/qa/page/project/operations/kubernetes/show.rb

@@ -53,3 +53,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Operations::Kubernetes::Show.prepend_if_ee('QA::EE::Page::Project::Operations::Kubernetes::Show')

qa/qa/page/project/pipeline/show.rb

@@ -60,3 +60,5 @@ module QA::Page
     end
   end
 end
+
+QA::Page::Project::Pipeline::Show.prepend_if_ee('QA::EE::Page::Project::Pipeline::Show')

qa/qa/page/project/settings/main.rb

@@ -41,3 +41,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Settings::Main.prepend_if_ee('QA::EE::Page::Project::Settings::Main')

qa/qa/page/project/settings/mirroring_repositories.rb

@@ -89,3 +89,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Settings::MirroringRepositories.prepend_if_ee('QA::EE::Page::Project::Settings::MirroringRepositories')

qa/qa/page/project/settings/protected_branches.rb

@@ -73,3 +73,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project::Settings::ProtectedBranches.prepend_if_ee('QA::EE::Page::Project::Settings::ProtectedBranches')

qa/qa/page/project/show.rb

@@ -131,3 +131,5 @@ module QA
     end
   end
 end
+
+QA::Page::Project.prepend_if_ee('QA::EE::Page::Project::Show')

qa/qa/runtime/env.rb

@@ -233,3 +233,5 @@ module QA
     end
   end
 end
+
+QA::Runtime::Env.extend_if_ee('QA::EE::Runtime::Env')

qa/qa/scenario/test/sanity/selectors.rb

@@ -56,3 +56,5 @@ module QA
     end
   end
 end
+
+QA::Scenario::Test::Sanity::Selectors.prepend_if_ee('QA::EE::Scenario::Test::Sanity::Selectors')

rubocop/cop/inject_enterprise_edition_module.rb

@@ -24,7 +24,7 @@ module RuboCop
 
         # We use `match?` here instead of RuboCop's AST matching, as this makes
         # it far easier to handle nested constants such as `EE::Foo::Bar::Baz`.
-        line.match?(/(\s|\()('|")?(::)?EE::/)
+        line.match?(/(\s|\()('|")?(::)?(QA::)?EE::/)
       end
 
       def on_send(node)

spec/rubocop/cop/inject_enterprise_edition_module_spec.rb

@@ -19,6 +19,15 @@ describe RuboCop::Cop::InjectEnterpriseEditionModule do
     SOURCE
   end
 
+  it 'flags the use of `prepend_if_ee QA::EE` in the middle of a file' do
+    expect_offense(<<~SOURCE)
+    class Foo
+      prepend_if_ee 'QA::EE::Foo'
+      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Injecting EE modules must be done on the last line of this file, outside of any class or module definitions
+    end
+    SOURCE
+  end
+
   it 'does not flag the use of `prepend_if_ee EEFoo` in the middle of a file' do
     expect_no_offenses(<<~SOURCE)
     class Foo
@@ -176,6 +185,16 @@ describe RuboCop::Cop::InjectEnterpriseEditionModule do
     SOURCE
   end
 
+  it 'disallows the use of prepend to inject a QA::EE module' do
+    expect_offense(<<~SOURCE)
+    class Foo
+    end
+
+    Foo.prepend(QA::EE::Foo)
+    ^^^^^^^^^^^^^^^^^^^^^^^^ EE modules must be injected using `include_if_ee`, `extend_if_ee`, or `prepend_if_ee`
+    SOURCE
+  end
+
   it 'disallows the use of extend to inject an EE module' do
     expect_offense(<<~SOURCE)
     class Foo