Merge branch 'feature/gb/qa/do-not-add-license-if-not-present' into 'master'

Do not add EE license if not set in GitLab QA tests

See merge request !1459

qa/qa/ee/scenario/license/add.rb

@@ -3,13 +3,13 @@ module QA
     module Scenario
       module License
         class Add < QA::Scenario::Template
-          def perform
+          def perform(license)
             QA::Page::Main::Entry.act { sign_in_using_credentials }
             QA::Page::Main::Menu.act { go_to_admin_area }
             QA::Page::Admin::Menu.act { go_to_license }
 
-            EE::Page::Admin::License.act do
-              add_new_license(ENV['EE_LICENSE']) if no_license?
+            EE::Page::Admin::License.act(license) do |key|
+              add_new_license(key) if no_license?
             end
 
             QA::Page::Main::Menu.act { sign_out }

qa/qa/ee/strategy.rb

@@ -2,12 +2,15 @@ module QA
   module EE
     module Strategy
       extend self
+
       def extend_autoloads!
         require 'qa/ee'
       end
 
       def perform_before_hooks
-        EE::Scenario::License::Add.perform
+        return unless ENV['EE_LICENSE']
+
+        EE::Scenario::License::Add.perform(ENV['EE_LICENSE'])
       rescue
         Capybara::Screenshot.screenshot_and_save_page
         raise