Merge branch 'fix-specs' into 'master'

Fix order dependant spec, do not write file in test

See merge request gitlab-org/gitlab-qa!1020

spec/gitlab/qa/report/report_results_spec.rb

@@ -56,6 +56,7 @@ describe Gitlab::QA::Report::ReportResults do
         allow(subject.__send__(:gitlab)).to receive(:assert_user_permission!)
         allow(::Dir).to receive(:glob).and_return([test_file])
         allow(::File).to receive(:read).with(test_file).and_return(test_data)
+        allow(::File).to receive(:write).with('file.json', kind_of(String))
       end
       context 'when a test case is linked in the given test' do

spec/gitlab/qa/scenario/test/sanity/version_spec.rb

@@ -27,6 +27,7 @@ module Gitlab
               Runtime::Scenario.define(:seed_db, false)
               Runtime::Scenario.define(:seed_admin_token, true)
               Runtime::Scenario.define(:omnibus_exec_commands, [])
+              Runtime::Scenario.define(:skip_server_hooks, false)
             end
             RSpec.shared_examples "weekday_hours" do |weekday_string, hours_int|
@@ -41,7 +42,10 @@ module Gitlab
             describe '#perform' do
               it 'throws an error with incorrect version specified' do
-                expect { described_class.perform('foo') }.to raise_error(Gitlab::QA::Release::InvalidImageNameError, "The release image name 'foo' does not have the expected format.")
+                expect { described_class.perform('foo') }.to raise_error(
+                  Gitlab::QA::Release::InvalidImageNameError,
+                  "The release image name 'foo' does not have the expected format."
+                )
               end
               context 'with a version' do