Merge branch 'master' into 37860-pipelines-page

* master: (88 commits)
  Fix deletion of container registry or images returning an error
  The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
  Decrease ABC threshold to 54.28
  Update VERSION to 10.2.0-pre
  Update CHANGELOG.md for 10.1.0
  Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
  Fix the external URLs generated for online view of HTML artifacts
  Use title as placeholder instead of issue title for reusability
  Fix failure in current_settings_spec.rb
  Clarify the difference between project_update and project_rename
  URI decode Page-Title header to preserve UTF-8 characters
  Update Gitaly version to v0.49.0
  Decrease Perceived Complexity threshold to 14
  Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
  Force non diff resolved discussion to display when collapse toggled
  Added submodule support in multi-file editor
  add note about after_script being run separately
  Check for element before evaluate_script
  Merge branch 'master-i18n' into 'master'
  Update Prometheus gem to fix problems with other files overwriting current file
  ...

34 files changed, 340 insertions, 189 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 59a6cfbf4f5..0a3a0f7da18 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -221,6 +221,20 @@ describe ApplicationController do
     end
   end
 
+  describe '#set_page_title_header' do
+    let(:controller) { described_class.new }
+
+    it 'URI encodes UTF-8 characters in the title' do
+      response = double(headers: {})
+      allow_any_instance_of(PageLayoutHelper).to receive(:page_title).and_return('€100 · GitLab')
+      allow(controller).to receive(:response).and_return(response)
+
+      controller.send(:set_page_title_header)
+
+      expect(response.headers['Page-Title']).to eq('%E2%82%AC100%20%C2%B7%20GitLab')
+    end
+  end
+
   context 'two-factor authentication' do
     let(:controller) { described_class.new }
 
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index e7631d4d709..5036c1d2226 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -32,6 +32,31 @@ describe GroupsController do
     end
   end
 
+  describe 'GET #show' do
+    before do
+      sign_in(user)
+      project
+    end
+
+    context 'as html' do
+      it 'assigns whether or not a group has children' do
+        get :show, id: group.to_param
+
+        expect(assigns(:has_children)).to be_truthy
+      end
+    end
+
+    context 'as atom' do
+      it 'assigns events for all the projects in the group' do
+        create(:event, project: project)
+
+        get :show, id: group.to_param, format: :atom
+
+        expect(assigns(:events)).not_to be_empty
+      end
+    end
+  end
+
   describe 'GET #new' do
     context 'when creating subgroups', :nested_groups do
       [true, false].each do |can_create_group_status|
diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb
index e26731fb691..c459d732507 100644
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
@@ -10,9 +10,36 @@ describe Projects::CommitsController do
   end
 
   describe "GET show" do
-    context "when the ref name ends in .atom" do
-      render_views
+    render_views
+
+    context 'with file path' do
+      before do
+        get(:show,
+            namespace_id: project.namespace,
+            project_id: project,
+            id: id)
+      end
+
+      context "valid branch, valid file" do
+        let(:id) { 'master/README.md' }
+
+        it { is_expected.to respond_with(:success) }
+      end
+
+      context "valid branch, invalid file" do
+        let(:id) { 'master/invalid-path.rb' }
 
+        it { is_expected.to respond_with(:not_found) }
+      end
+
+      context "invalid branch, valid file" do
+        let(:id) { 'invalid-branch/README.md' }
+
+        it { is_expected.to respond_with(:not_found) }
+      end
+    end
+
+    context "when the ref name ends in .atom" do
       context "when the ref does not exist with the suffix" do
         it "renders as atom" do
           get(:show,
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 91c4e5037de..60ed17c0c81 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -171,12 +171,14 @@ describe 'Issue Boards', :js do
         expect(page).to have_selector('.card', count: 20)
         expect(page).to have_content('Showing 20 of 58 issues')
 
+        find('.board .board-list')
         evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight")
         wait_for_requests
 
         expect(page).to have_selector('.card', count: 40)
         expect(page).to have_content('Showing 40 of 58 issues')
 
+        find('.board .board-list')
         evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight")
         wait_for_requests
 
@@ -449,11 +451,13 @@ describe 'Issue Boards', :js do
           expect(page).to have_selector('.card', count: 20)
           expect(page).to have_content('Showing 20 of 51 issues')
 
+          find('.board .board-list')
           evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight")
 
           expect(page).to have_selector('.card', count: 40)
           expect(page).to have_content('Showing 40 of 51 issues')
 
+          find('.board .board-list')
           evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight")
 
           expect(page).to have_selector('.card', count: 51)
diff --git a/spec/features/ci_lint_spec.rb b/spec/features/ci_lint_spec.rb
index 9accd7bb07c..9bc23baf6cf 100644
--- a/spec/features/ci_lint_spec.rb
+++ b/spec/features/ci_lint_spec.rb
@@ -10,6 +10,7 @@ describe 'CI Lint', :js do
       visit ci_lint_path
       # Ace editor updates a hidden textarea and it happens asynchronously
       # `sleep 0.1` is actually needed here because of this
+      find('#ci-editor')
       execute_script("ace.edit('ci-editor').setValue(" + yaml_content.to_json + ");")
       sleep 0.1
       click_on 'Validate'
diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index 5610894fd9a..a8919976c31 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -87,8 +87,10 @@ RSpec.describe 'Dashboard Issues' do
       project_path = "/#{project.path_with_namespace}"
       project_json = { name: project.name_with_namespace, url: project_path }.to_json
 
-      # similate selection, and prevent overlap by dropdown menu
+      # simulate selection, and prevent overlap by dropdown menu
+      first('.project-item-select', visible: false)
       execute_script("$('.project-item-select').val('#{project_json}').trigger('change');")
+      find('#select2-drop-mask', visible: false)
       execute_script("$('#select2-drop-mask').remove();")
 
       find('.new-project-item-link').trigger('click')
diff --git a/spec/features/issues/issue_detail_spec.rb b/spec/features/issues/issue_detail_spec.rb
index c0c396af93f..6fbee0ebcb5 100644
--- a/spec/features/issues/issue_detail_spec.rb
+++ b/spec/features/issues/issue_detail_spec.rb
@@ -25,7 +25,7 @@ feature 'Issue Detail', :js do
       wait_for_requests
 
       click_link 'Edit'
-      fill_in 'issue-title', with: 'issue title'
+      fill_in 'issuable-title', with: 'issue title'
       click_button 'Save'
 
       Users::DestroyService.new(user).execute(user)
diff --git a/spec/features/issues/markdown_toolbar_spec.rb b/spec/features/issues/markdown_toolbar_spec.rb
index 6869c2c869d..fee8fd9b365 100644
--- a/spec/features/issues/markdown_toolbar_spec.rb
+++ b/spec/features/issues/markdown_toolbar_spec.rb
@@ -16,6 +16,7 @@ feature 'Issue markdown toolbar', :js do
     find('#note-body').native.send_key(:enter)
     find('#note-body').native.send_keys('bold')
 
+    find('.js-main-target-form #note-body')
     page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 9)')
 
     first('.toolbar-btn').click
@@ -28,6 +29,7 @@ feature 'Issue markdown toolbar', :js do
     find('#note-body').native.send_key(:enter)
     find('#note-body').native.send_keys('underline')
 
+    find('.js-main-target-form #note-body')
     page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 50)')
 
     find('.toolbar-btn:nth-child(2)').click
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb
index b0432ed8fc6..ba976bc7216 100644
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -60,12 +60,14 @@ feature 'Merge request conflict resolution', :js do
       within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do
         click_button 'Edit inline'
         wait_for_requests
+        find('.files-wrapper .diff-file pre')
         execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("One morning");')
       end
 
       within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
         click_button 'Edit inline'
         wait_for_requests
+        find('.files-wrapper .diff-file pre')
         execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");')
       end
 
@@ -139,6 +141,7 @@ feature 'Merge request conflict resolution', :js do
       it 'conflicts are resolved in Edit inline mode' do
         within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do
           wait_for_requests
+          find('.files-wrapper .diff-file pre')
           execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");')
         end
 
diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
index 4538555c168..4362f8b3fcc 100644
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -66,6 +66,7 @@ feature 'Edit Merge Request' do
     end
 
     def get_textarea_height
+      find('#merge_request_description')
       page.evaluate_script('document.getElementById("merge_request_description").offsetHeight')
     end
   end
diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
index dcc70338d7f..bf21a719901 100644
--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
@@ -52,10 +52,12 @@ feature 'Mini Pipeline Graph', :js do
     end
 
     it 'should expand when hovered' do
+      find('.mini-pipeline-graph-dropdown-toggle')
       before_width = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').outerWidth();")
 
       toggle.hover
 
+      find('.mini-pipeline-graph-dropdown-toggle')
       after_width = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').outerWidth();")
 
       expect(before_width).to be < after_width
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 6c625ed17aa..965028a6f90 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -20,6 +20,7 @@ feature 'Editing file blob', :js do
     def edit_and_commit
       wait_for_requests
       find('.js-edit-blob').click
+      find('#editor')
       execute_script('ace.edit("editor").setValue("class NextFeature\nend\n")')
       click_button 'Commit changes'
     end
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 9f67216705d..a012db8fd27 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -35,7 +35,7 @@ feature 'issuable templates', :js do
       page.within('.content .issuable-actions') do
         click_on 'Edit'
       end
-      fill_in :'issue-title', with: 'test issue title'
+      fill_in :'issuable-title', with: 'test issue title'
     end
 
     scenario 'user selects "bug" template' do
@@ -80,7 +80,7 @@ feature 'issuable templates', :js do
       page.within('.content .issuable-actions') do
         click_on 'Edit'
       end
-      fill_in :'issue-title', with: 'test issue title'
+      fill_in :'issuable-title', with: 'test issue title'
       fill_in :'issue-description', with: prior_description
     end
 
diff --git a/spec/features/projects/user_creates_files_spec.rb b/spec/features/projects/user_creates_files_spec.rb
index cbe70a93942..d84b91ddc32 100644
--- a/spec/features/projects/user_creates_files_spec.rb
+++ b/spec/features/projects/user_creates_files_spec.rb
@@ -60,6 +60,7 @@ describe 'User creates files' do
       end
 
       it 'creates and commit a new file', :js do
+        find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
         fill_in(:file_name, with: 'not_a_file.md')
         fill_in(:commit_message, with: 'New commit message', visible: true)
@@ -75,6 +76,7 @@ describe 'User creates files' do
       end
 
       it 'creates and commit a new file with new lines at the end of file', :js do
+        find('#editor')
         execute_script('ace.edit("editor").setValue("Sample\n\n\n")')
         fill_in(:file_name, with: 'not_a_file.md')
         fill_in(:commit_message, with: 'New commit message', visible: true)
@@ -86,6 +88,7 @@ describe 'User creates files' do
 
         find('.js-edit-blob').click
 
+        find('#editor')
         expect(evaluate_script('ace.edit("editor").getValue()')).to eq("Sample\n\n\n")
       end
 
@@ -94,6 +97,7 @@ describe 'User creates files' do
 
         expect(page).to have_selector('.file-editor')
 
+        find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
         fill_in(:commit_message, with: 'New commit message', visible: true)
         click_button('Commit changes')
@@ -108,6 +112,7 @@ describe 'User creates files' do
       it 'creates and commit a new file specifying a new branch', :js do
         expect(page).to have_selector('.file-editor')
 
+        find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
         fill_in(:file_name, with: 'not_a_file.md')
         fill_in(:commit_message, with: 'New commit message', visible: true)
@@ -136,6 +141,7 @@ describe 'User creates files' do
 
         expect(page).to have_selector('.file-editor')
 
+        find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
 
         fill_in(:file_name, with: 'not_a_file.md')
diff --git a/spec/features/projects/user_edits_files_spec.rb b/spec/features/projects/user_edits_files_spec.rb
index e8d83a661d4..d26ee653415 100644
--- a/spec/features/projects/user_edits_files_spec.rb
+++ b/spec/features/projects/user_edits_files_spec.rb
@@ -23,6 +23,7 @@ describe 'User edits files' do
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
 
       expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
@@ -40,6 +41,7 @@ describe 'User edits files' do
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       fill_in(:commit_message, with: 'New commit message', visible: true)
       click_button('Commit changes')
@@ -57,6 +59,7 @@ describe 'User edits files' do
 
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       fill_in(:commit_message, with: 'New commit message', visible: true)
       fill_in(:branch_name, with: 'new_branch_name', visible: true)
@@ -74,6 +77,7 @@ describe 'User edits files' do
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       click_link('Preview changes')
 
@@ -103,6 +107,7 @@ describe 'User edits files' do
 
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
 
       expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
@@ -119,6 +124,7 @@ describe 'User edits files' do
 
       find('.file-editor', match: :first)
 
+      find('#editor')
       execute_script("ace.edit('editor').setValue('*.rbca')")
       fill_in(:commit_message, with: 'New commit message', visible: true)
       click_button('Commit changes')
@@ -145,6 +151,7 @@ describe 'User edits files' do
         expect(page).not_to have_link('Fork')
         expect(page).not_to have_button('Cancel')
 
+        find('#editor')
         execute_script("ace.edit('editor').setValue('*.rbca')")
         fill_in(:commit_message, with: 'Another commit', visible: true)
         click_button('Commit changes')
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 66785cf32da..7a241b02d28 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -312,9 +312,9 @@ describe ApplicationHelper do
 
   describe '#locale_path' do
     it 'returns the locale path with an `_`' do
-      Gitlab::I18n.locale = 'pt-BR'
-
-      expect(helper.locale_path).to include('assets/locale/pt_BR/app')
+      Gitlab::I18n.with_locale('pt-BR') do
+        expect(helper.locale_path).to include('assets/locale/pt_BR/app')
+      end
     end
   end
 end
diff --git a/spec/javascripts/blob/blob_file_dropzone_spec.js b/spec/javascripts/blob/blob_file_dropzone_spec.js
index 2c8183ff77b..47de63e6690 100644
--- a/spec/javascripts/blob/blob_file_dropzone_spec.js
+++ b/spec/javascripts/blob/blob_file_dropzone_spec.js
@@ -1,4 +1,3 @@
-import 'dropzone';
 import BlobFileDropzone from '~/blob/blob_file_dropzone';
 
 describe('BlobFileDropzone', () => {
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
index 18916c5aa97..e441d1153ed 100644
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
@@ -5,8 +5,7 @@ import '~/merge_request_tabs';
 import '~/commit/pipelines/pipelines_bundle';
 import '~/breakpoints';
 import '~/lib/utils/common_utils';
-import '~/diff';
-import '~/files_comment_button';
+import Diff from '~/diff';
 import '~/notes';
 import 'vendor/jquery.scrollTo';
 
@@ -225,7 +224,7 @@ import 'vendor/jquery.scrollTo';
       describe('with "Side-by-side"/parallel diff view', () => {
         beforeEach(function () {
           this.class.diffViewType = () => 'parallel';
-          gl.Diff.prototype.diffViewType = () => 'parallel';
+          Diff.prototype.diffViewType = () => 'parallel';
         });
 
         it('maintains `container-limited` for pipelines tab', function (done) {
diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js
index 334bf0997ca..107f6797f8a 100644
--- a/spec/javascripts/repo/components/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
@@ -93,6 +93,32 @@ describe('RepoFile', () => {
     expect(vm.linkClicked).toHaveBeenCalledWith(vm.file);
   });
 
+  describe('submodule', () => {
+    let f;
+    let vm;
+
+    beforeEach(() => {
+      f = file('submodule name', '123456789');
+      f.type = 'submodule';
+
+      vm = createComponent({
+        file: f,
+      });
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    it('renders submodule short ID', () => {
+      expect(vm.$el.querySelector('.commit-sha').textContent.trim()).toBe('12345678');
+    });
+
+    it('renders ID next to submodule name', () => {
+      expect(vm.$el.querySelector('td').textContent.replace(/\s+/g, ' ')).toContain('submodule name @ 12345678');
+    });
+  });
+
   describe('methods', () => {
     describe('linkClicked', () => {
       it('$emits fileNameClicked with file obj', () => {
diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js
index 61283da8257..148f275e03d 100644
--- a/spec/javascripts/repo/components/repo_sidebar_spec.js
+++ b/spec/javascripts/repo/components/repo_sidebar_spec.js
@@ -117,6 +117,21 @@ describe('RepoSidebar', () => {
 
         expect(Helper.setDirectoryToClosed).toHaveBeenCalledWith(RepoStore.files[0]);
       });
+
+      describe('submodule', () => {
+        it('opens submodule project URL', () => {
+          spyOn(gl.utils, 'visitUrl');
+
+          const f = file();
+          f.type = 'submodule';
+
+          vm = createComponent();
+
+          vm.fileClicked(f);
+
+          expect(gl.utils.visitUrl).toHaveBeenCalledWith('url');
+        });
+      });
     });
 
     describe('goToPreviousDirectoryClicked', () => {
diff --git a/spec/javascripts/repo/mock_data.js b/spec/javascripts/repo/mock_data.js
index 836b867205e..71e275caf09 100644
--- a/spec/javascripts/repo/mock_data.js
+++ b/spec/javascripts/repo/mock_data.js
@@ -1,13 +1,14 @@
 import RepoHelper from '~/repo/helpers/repo_helper';
 
 // eslint-disable-next-line import/prefer-default-export
-export const file = (name = 'name') => RepoHelper.serializeRepoEntity('blob', {
+export const file = (name = 'name', id = name) => RepoHelper.serializeRepoEntity('blob', {
+  id,
   icon: 'icon',
   url: 'url',
   name,
   last_commit: {
     id: '123',
     message: 'test',
-    committed_date: '',
+    committed_date: new Date().toISOString(),
   },
 });
diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js
index bd18f79cea7..7047053d131 100644
--- a/spec/javascripts/zen_mode_spec.js
+++ b/spec/javascripts/zen_mode_spec.js
@@ -1,7 +1,6 @@
 /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-return-assign, new-cap, max-len */
-/* global Dropzone */
 /* global Mousetrap */
-
+import Dropzone from 'dropzone';
 import ZenMode from '~/zen_mode';
 
 (function() {
diff --git a/spec/lib/gitlab/backup/manager_spec.rb b/spec/lib/gitlab/backup/manager_spec.rb
index 422f2af7266..b68301a066a 100644
--- a/spec/lib/gitlab/backup/manager_spec.rb
+++ b/spec/lib/gitlab/backup/manager_spec.rb
@@ -172,10 +172,6 @@ describe Backup::Manager do
   end
 
   describe '#unpack' do
-    before do
-      allow(Dir).to receive(:chdir)
-    end
-
     context 'when there are no backup files in the directory' do
       before do
         allow(Dir).to receive(:glob).and_return([])
diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb
index d57ffcae8e1..492659a82b0 100644
--- a/spec/lib/gitlab/current_settings_spec.rb
+++ b/spec/lib/gitlab/current_settings_spec.rb
@@ -21,7 +21,7 @@ describe Gitlab::CurrentSettings do
 
       it 'falls back to DB if Redis returns an empty value' do
         expect(ApplicationSetting).to receive(:cached).and_return(nil)
-        expect(ApplicationSetting).to receive(:last).and_call_original
+        expect(ApplicationSetting).to receive(:last).and_call_original.twice
 
         expect(current_application_settings).to be_a(ApplicationSetting)
       end
diff --git a/spec/lib/gitlab/encoding_helper_spec.rb b/spec/lib/gitlab/encoding_helper_spec.rb
index 8b14b227e65..9151c66afb3 100644
--- a/spec/lib/gitlab/encoding_helper_spec.rb
+++ b/spec/lib/gitlab/encoding_helper_spec.rb
@@ -6,6 +6,9 @@ describe Gitlab::EncodingHelper do
 
   describe '#encode!' do
     [
+      ["nil", nil, nil],
+      ["empty string", "".encode("ASCII-8BIT"), "".encode("UTF-8")],
+      ["invalid utf-8 encoded string", "my bad string\xE5".force_encoding("UTF-8"), "my bad string"],
       [
         'leaves ascii only string as is',
         'ascii only string',
@@ -81,6 +84,9 @@ describe Gitlab::EncodingHelper do
 
   describe '#encode_utf8' do
     [
+      ["nil", nil, nil],
+      ["empty string", "".encode("ASCII-8BIT"), "".encode("UTF-8")],
+      ["invalid utf-8 encoded string", "my bad string\xE5".force_encoding("UTF-8"), "my bad stringå"],
       [
         "encodes valid utf8 encoded string to utf8",
         "λ, λ, λ".encode("UTF-8"),
@@ -95,12 +101,18 @@ describe Gitlab::EncodingHelper do
         "encodes valid ISO-8859-1 encoded string to utf8",
         "Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("ISO-8859-1", "UTF-8"),
         "Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("UTF-8")
+      ],
+      [
+        # Test case from https://gitlab.com/gitlab-org/gitlab-ce/issues/39227
+        "Equifax branch name",
+        "refs/heads/Equifax".encode("UTF-8"),
+        "refs/heads/Equifax".encode("UTF-8")
       ]
     ].each do |description, test_string, xpect|
       it description do
-        r = ext_class.encode_utf8(test_string.force_encoding('UTF-8'))
+        r = ext_class.encode_utf8(test_string)
         expect(r).to eq(xpect)
-        expect(r.encoding.name).to eq('UTF-8')
+        expect(r.encoding.name).to eq('UTF-8') if xpect
       end
     end
 
diff --git a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
index fcd90fab547..2662cc20b32 100644
--- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
@@ -11,7 +11,7 @@ describe Gitlab::GithubImport::WikiFormatter do
 
   describe '#disk_path' do
     it 'appends .wiki to project path' do
-      expect(wiki.disk_path).to eq project.disk_path + '.wiki'
+      expect(wiki.disk_path).to eq project.wiki.disk_path
     end
   end
 
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 6945c90cb9b..30495fd4f5e 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -220,6 +220,21 @@ describe ApplicationSetting do
         expect(described_class.current).to eq(:last)
       end
     end
+
+    context 'when an ApplicationSetting is not yet present' do
+      it 'does not cache nil object' do
+        # when missing settings a nil object is returned, but not cached
+        allow(described_class).to receive(:last).and_return(nil).twice
+        expect(described_class.current).to be_nil
+
+        # when the settings are set the method returns a valid object
+        allow(described_class).to receive(:last).and_return(:last)
+        expect(described_class.current).to eq(:last)
+
+        # subsequent calls get everything from cache
+        expect(described_class.current).to eq(:last)
+      end
+    end
   end
 
   context 'restrict creating duplicates' do
diff --git a/spec/models/ci/artifact_blob_spec.rb b/spec/models/ci/artifact_blob_spec.rb
index d5ba088af53..4e72d9d748e 100644
--- a/spec/models/ci/artifact_blob_spec.rb
+++ b/spec/models/ci/artifact_blob_spec.rb
@@ -56,15 +56,14 @@ describe Ci::ArtifactBlob do
     end
 
     context 'txt extensions' do
-      let(:entry) { build.artifacts_metadata_entry('other_artifacts_0.1.2/doc_sample.txt') }
+      let(:path) { 'other_artifacts_0.1.2/doc_sample.txt' }
+      let(:entry) { build.artifacts_metadata_entry(path) }
 
       it 'returns a URL' do
         url = subject.external_url(build.project, build)
 
         expect(url).not_to be_nil
-        expect(url).to start_with("http")
-        expect(url).to match Gitlab.config.pages.host
-        expect(url).to end_with(entry.path)
+        expect(url).to eq("http://#{project.namespace.path}.#{Gitlab.config.pages.host}/-/#{project.path}/-/jobs/#{build.id}/artifacts/#{path}")
       end
     end
   end
diff --git a/spec/rubocop/cop/rspec/env_assignment_spec.rb b/spec/rubocop/cop/rspec/env_assignment_spec.rb
new file mode 100644
index 00000000000..4e859b6f6fa
--- /dev/null
+++ b/spec/rubocop/cop/rspec/env_assignment_spec.rb
@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+require 'rubocop'
+require 'rubocop/rspec/support'
+
+require_relative '../../../../rubocop/cop/rspec/env_assignment'
+
+describe RuboCop::Cop::RSpec::EnvAssignment do
+  include CopHelper
+
+  OFFENSE_CALL_SINGLE_QUOTES_KEY = %(ENV['FOO'] = 'bar').freeze
+  OFFENSE_CALL_DOUBLE_QUOTES_KEY = %(ENV["FOO"] = 'bar').freeze
+
+  let(:source_file) { 'spec/foo_spec.rb' }
+
+  subject(:cop) { described_class.new }
+
+  shared_examples 'an offensive ENV#[]= call' do |content|
+    it "registers an offense for `#{content}`" do
+      inspect_source(cop, content, source_file)
+
+      expect(cop.offenses.size).to eq(1)
+      expect(cop.offenses.map(&:line)).to eq([1])
+      expect(cop.highlights).to eq([content])
+    end
+  end
+
+  shared_examples 'an autocorrected ENV#[]= call' do |content, autocorrected_content|
+    it "registers an offense for `#{content}` and autocorrects it to `#{autocorrected_content}`" do
+      autocorrected = autocorrect_source(cop, content, source_file)
+
+      expect(autocorrected).to eql(autocorrected_content)
+    end
+  end
+
+  context 'in a spec file' do
+    before do
+      allow(cop).to receive(:in_spec?).and_return(true)
+    end
+
+    context 'with a key using single quotes' do
+      it_behaves_like 'an offensive ENV#[]= call', OFFENSE_CALL_SINGLE_QUOTES_KEY
+      it_behaves_like 'an autocorrected ENV#[]= call', OFFENSE_CALL_SINGLE_QUOTES_KEY, %(stub_env('FOO', 'bar'))
+    end
+
+    context 'with a key using double quotes' do
+      it_behaves_like 'an offensive ENV#[]= call', OFFENSE_CALL_DOUBLE_QUOTES_KEY
+      it_behaves_like 'an autocorrected ENV#[]= call', OFFENSE_CALL_DOUBLE_QUOTES_KEY, %(stub_env("FOO", 'bar'))
+    end
+  end
+
+  context 'outside of a spec file' do
+    it "does not register an offense for `#{OFFENSE_CALL_SINGLE_QUOTES_KEY}` in a non-spec file" do
+      inspect_source(cop, OFFENSE_CALL_SINGLE_QUOTES_KEY)
+
+      expect(cop.offenses.size).to eq(0)
+    end
+  end
+end
diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
index 9f05cabf7ae..7132b9cd221 100644
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -121,14 +121,31 @@ shared_examples 'discussion comments' do |resource_name|
         end
       end
 
-      it 'clicking "Start discussion" will post a discussion' do
-        find(submit_selector).click
+      describe 'creating a discussion' do
+        before do
+          find(submit_selector).click
+          find(comments_selector, match: :first)
+        end
+
+        it 'clicking "Start discussion" will post a discussion' do
+          new_comment = all(comments_selector).last
+
+          expect(new_comment).to have_content 'a'
+          expect(new_comment).to have_selector '.discussion'
+        end
+
+        if resource_name == 'merge request'
+          it 'shows resolved discussion when toggled' do
+            click_button "Resolve discussion"
+
+            expect(page).to have_selector('.note-row-1', visible: true)
 
-        find(comments_selector, match: :first)
-        new_comment = all(comments_selector).last
+            refresh
+            click_button "Toggle discussion"
 
-        expect(new_comment).to have_content 'a'
-        expect(new_comment).to have_selector '.discussion'
+            expect(page).to have_selector('.note-row-1', visible: true)
+          end
+        end
       end
 
       if resource_name == 'issue'
diff --git a/spec/support/select2_helper.rb b/spec/support/select2_helper.rb
index 6b1853c2364..55da961e173 100644
--- a/spec/support/select2_helper.rb
+++ b/spec/support/select2_helper.rb
@@ -16,6 +16,7 @@ module Select2Helper
 
     selector = options.fetch(:from)
 
+    first(selector, visible: false)
     if options[:multiple]
       execute_script("$('#{selector}').select2('val', ['#{value}']).trigger('change');")
     else
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 886052d7848..bf2e11bc360 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -4,7 +4,15 @@ require 'rake'
 describe 'gitlab:app namespace rake task' do
   let(:enable_registry) { true }
 
-  before :all do
+  def tars_glob
+    Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar'))
+  end
+
+  def backup_tar
+    tars_glob.first
+  end
+
+  before(:all) do
     Rake.application.rake_require 'tasks/gitlab/helpers'
     Rake.application.rake_require 'tasks/gitlab/backup'
     Rake.application.rake_require 'tasks/gitlab/shell'
@@ -19,9 +27,16 @@ describe 'gitlab:app namespace rake task' do
   end
 
   before do
+    stub_env('force', 'yes')
+    FileUtils.rm(tars_glob, force: true)
+    reenable_backup_sub_tasks
     stub_container_registry_config(enabled: enable_registry)
   end
 
+  after do
+    FileUtils.rm(tars_glob, force: true)
+  end
+
   def run_rake_task(task_name)
     Rake::Task[task_name].reenable
     Rake.application.invoke_task task_name
@@ -34,22 +49,15 @@ describe 'gitlab:app namespace rake task' do
   end
 
   describe 'backup_restore' do
-    before do
-      # avoid writing task output to spec progress
-      allow($stdout).to receive :write
-    end
-
     context 'gitlab version' do
       before do
         allow(Dir).to receive(:glob).and_return(['1_gitlab_backup.tar'])
-        allow(Dir).to receive(:chdir)
         allow(File).to receive(:exist?).and_return(true)
         allow(Kernel).to receive(:system).and_return(true)
         allow(FileUtils).to receive(:cp_r).and_return(true)
         allow(FileUtils).to receive(:mv).and_return(true)
         allow(Rake::Task["gitlab:shell:setup"])
           .to receive(:invoke).and_return(true)
-        ENV['force'] = 'yes'
       end
 
       let(:gitlab_version) { Gitlab::VERSION }
@@ -58,8 +66,9 @@ describe 'gitlab:app namespace rake task' do
         allow(YAML).to receive(:load_file)
           .and_return({ gitlab_version: "not #{gitlab_version}" })
 
-        expect { run_rake_task('gitlab:backup:restore') }
-          .to raise_error(SystemExit)
+        expect do
+          expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout
+        end.to raise_error(SystemExit)
       end
 
       it 'invokes restoration on match' do
@@ -75,44 +84,15 @@ describe 'gitlab:app namespace rake task' do
         expect(Rake::Task['gitlab:backup:lfs:restore']).to receive(:invoke)
         expect(Rake::Task['gitlab:backup:registry:restore']).to receive(:invoke)
         expect(Rake::Task['gitlab:shell:setup']).to receive(:invoke)
-        expect { run_rake_task('gitlab:backup:restore') }.not_to raise_error
+        expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout
       end
     end
   end # backup_restore task
 
   describe 'backup' do
-    before(:all) do
-      ENV['force'] = 'yes'
-    end
-
-    def tars_glob
-      Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar'))
-    end
-
-    def create_backup
-      FileUtils.rm tars_glob
-
+    before do
       # This reconnect makes our project fixture disappear, breaking the restore. Stub it out.
       allow(ActiveRecord::Base.connection).to receive(:reconnect!)
-
-      # Redirect STDOUT and run the rake task
-      orig_stdout = $stdout
-      $stdout = StringIO.new
-      reenable_backup_sub_tasks
-      run_rake_task('gitlab:backup:create')
-      reenable_backup_sub_tasks
-      $stdout = orig_stdout
-
-      @backup_tar = tars_glob.first
-    end
-
-    def restore_backup
-      orig_stdout = $stdout
-      $stdout = StringIO.new
-      reenable_backup_sub_tasks
-      run_rake_task('gitlab:backup:restore')
-      reenable_backup_sub_tasks
-      $stdout = orig_stdout
     end
 
     describe 'backup creation and deletion using custom_hooks' do
@@ -120,27 +100,17 @@ describe 'gitlab:app namespace rake task' do
       let(:user_backup_path) { "repositories/#{project.disk_path}" }
 
       before do
-        @origin_cd = Dir.pwd
-
-        path = File.join(project.repository.path_to_repo, filename)
+        stub_env('SKIP', 'db')
+        path = File.join(project.repository.path_to_repo, 'custom_hooks')
         FileUtils.mkdir_p(path)
         FileUtils.touch(File.join(path, "dummy.txt"))
-
-        ENV["SKIP"] = "db"
-        create_backup
-      end
-
-      after do
-        ENV["SKIP"] = ""
-        FileUtils.rm(@backup_tar)
-        Dir.chdir(@origin_cd)
       end
 
       context 'project uses custom_hooks and successfully creates backup' do
-        let(:filename) { "custom_hooks" }
-
         it 'creates custom_hooks.tar and project bundle' do
-          tar_contents, exit_status = Gitlab::Popen.popen(%W{tar -tvf #{@backup_tar}})
+          expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
+          tar_contents, exit_status = Gitlab::Popen.popen(%W{tar -tvf #{backup_tar}})
 
           expect(exit_status).to eq(0)
           expect(tar_contents).to match(user_backup_path)
@@ -149,47 +119,43 @@ describe 'gitlab:app namespace rake task' do
         end
 
         it 'restores files correctly' do
-          restore_backup
+          expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+          expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout
 
-          expect(Dir.entries(File.join(project.repository.path, "custom_hooks"))).to include("dummy.txt")
+          expect(Dir.entries(File.join(project.repository.path, 'custom_hooks'))).to include("dummy.txt")
         end
       end
     end
 
     context 'tar creation' do
-      before do
-        create_backup
-      end
-
-      after do
-        FileUtils.rm(@backup_tar)
-      end
-
       context 'archive file permissions' do
         it 'sets correct permissions on the tar file' do
-          expect(File.exist?(@backup_tar)).to be_truthy
-          expect(File::Stat.new(@backup_tar).mode.to_s(8)).to eq('100600')
+          expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
+          expect(File.exist?(backup_tar)).to be_truthy
+          expect(File::Stat.new(backup_tar).mode.to_s(8)).to eq('100600')
         end
 
         context 'with custom archive_permissions' do
           before do
             allow(Gitlab.config.backup).to receive(:archive_permissions).and_return(0651)
-            # We created a backup in a before(:all) so it got the default permissions.
-            # We now need to do some work to create a _new_ backup file using our stub.
-            FileUtils.rm(@backup_tar)
-            create_backup
           end
 
           it 'uses the custom permissions' do
-            expect(File::Stat.new(@backup_tar).mode.to_s(8)).to eq('100651')
+            expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
+            expect(File::Stat.new(backup_tar).mode.to_s(8)).to eq('100651')
           end
         end
       end
 
       it 'sets correct permissions on the tar contents' do
+        expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
         tar_contents, exit_status = Gitlab::Popen.popen(
-          %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz}
+          %W{tar -tvf #{backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz}
         )
+
         expect(exit_status).to eq(0)
         expect(tar_contents).to match('db/')
         expect(tar_contents).to match('uploads.tar.gz')
@@ -203,6 +169,8 @@ describe 'gitlab:app namespace rake task' do
       end
 
       it 'deletes temp directories' do
+        expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
         temp_dirs = Dir.glob(
           File.join(Gitlab.config.backup.path, '{db,repositories,uploads,builds,artifacts,pages,lfs,registry}')
         )
@@ -214,9 +182,12 @@ describe 'gitlab:app namespace rake task' do
         let(:enable_registry) { false }
 
         it 'does not create registry.tar.gz' do
+          expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
           tar_contents, exit_status = Gitlab::Popen.popen(
-            %W{tar -tvf #{@backup_tar}}
+            %W{tar -tvf #{backup_tar}}
           )
+
           expect(exit_status).to eq(0)
           expect(tar_contents).not_to match('registry.tar.gz')
         end
@@ -232,37 +203,33 @@ describe 'gitlab:app namespace rake task' do
         }
       end
 
-      let(:project_a) { create(:project, :repository, repository_storage: 'default') }
-      let(:project_b) { create(:project, :repository, repository_storage: 'test_second_storage') }
-
       before do
-        FileUtils.mkdir('tmp/tests/default_storage')
-        FileUtils.mkdir('tmp/tests/custom_storage')
+        # We only need a backup of the repositories for this test
+        stub_env('SKIP', 'db,uploads,builds,artifacts,lfs,registry')
+        FileUtils.mkdir(Settings.absolute('tmp/tests/default_storage'))
+        FileUtils.mkdir(Settings.absolute('tmp/tests/custom_storage'))
         allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
 
-        # Create the projects now, after mocking the settings but before doing the backup
-        project_a
-        project_b
-
         # Avoid asking gitaly about the root ref (which will fail beacuse of the
         # mocked storages)
         allow_any_instance_of(Repository).to receive(:empty_repo?).and_return(false)
-
-        # We only need a backup of the repositories for this test
-        ENV["SKIP"] = "db,uploads,builds,artifacts,lfs,registry"
-        create_backup
       end
 
       after do
-        FileUtils.rm_rf('tmp/tests/default_storage')
-        FileUtils.rm_rf('tmp/tests/custom_storage')
-        FileUtils.rm(@backup_tar) if @backup_tar
+        FileUtils.rm_rf(Settings.absolute('tmp/tests/default_storage'))
+        FileUtils.rm_rf(Settings.absolute('tmp/tests/custom_storage'))
       end
 
       it 'includes repositories in all repository storages' do
+        project_a = create(:project, :repository, repository_storage: 'default')
+        project_b = create(:project, :repository, repository_storage: 'test_second_storage')
+
+        expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
         tar_contents, exit_status = Gitlab::Popen.popen(
-          %W{tar -tvf #{@backup_tar} repositories}
+          %W{tar -tvf #{backup_tar} repositories}
         )
+
         expect(exit_status).to eq(0)
         expect(tar_contents).to match("repositories/#{project_a.disk_path}.bundle")
         expect(tar_contents).to match("repositories/#{project_b.disk_path}.bundle")
@@ -271,35 +238,15 @@ describe 'gitlab:app namespace rake task' do
   end # backup_create task
 
   describe "Skipping items" do
-    def tars_glob
-      Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar'))
-    end
-
-    before :all do
-      @origin_cd = Dir.pwd
-
-      reenable_backup_sub_tasks
-
-      FileUtils.rm tars_glob
-
-      # Redirect STDOUT and run the rake task
-      orig_stdout = $stdout
-      $stdout = StringIO.new
-      ENV["SKIP"] = "repositories,uploads"
-      run_rake_task('gitlab:backup:create')
-      $stdout = orig_stdout
-
-      @backup_tar = tars_glob.first
-    end
-
-    after :all do
-      FileUtils.rm(@backup_tar)
-      Dir.chdir @origin_cd
+    before do
+      stub_env('SKIP', 'repositories,uploads')
     end
 
     it "does not contain skipped item" do
+      expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
       tar_contents, _exit_status = Gitlab::Popen.popen(
-        %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz}
+        %W{tar -tvf #{backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz}
       )
 
       expect(tar_contents).to match('db/')
@@ -313,9 +260,10 @@ describe 'gitlab:app namespace rake task' do
     end
 
     it 'does not invoke repositories restore' do
+      expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
       allow(Rake::Task['gitlab:shell:setup'])
         .to receive(:invoke).and_return(true)
-      allow($stdout).to receive :write
 
       expect(Rake::Task['gitlab:db:drop_tables']).to receive :invoke
       expect(Rake::Task['gitlab:backup:db:restore']).to receive :invoke
@@ -327,38 +275,15 @@ describe 'gitlab:app namespace rake task' do
       expect(Rake::Task['gitlab:backup:lfs:restore']).to receive :invoke
       expect(Rake::Task['gitlab:backup:registry:restore']).to receive :invoke
       expect(Rake::Task['gitlab:shell:setup']).to receive :invoke
-      expect { run_rake_task('gitlab:backup:restore') }.not_to raise_error
+      expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout
     end
   end
 
   describe "Human Readable Backup Name" do
-    def tars_glob
-      Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar'))
-    end
-
-    before :all do
-      @origin_cd = Dir.pwd
-
-      reenable_backup_sub_tasks
-
-      FileUtils.rm tars_glob
-
-      # Redirect STDOUT and run the rake task
-      orig_stdout = $stdout
-      $stdout = StringIO.new
-      run_rake_task('gitlab:backup:create')
-      $stdout = orig_stdout
-
-      @backup_tar = tars_glob.first
-    end
-
-    after :all do
-      FileUtils.rm(@backup_tar)
-      Dir.chdir @origin_cd
-    end
-
     it 'name has human readable time' do
-      expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+.*_gitlab_backup.tar$/)
+      expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout
+
+      expect(backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+.*_gitlab_backup.tar$/)
     end
   end
 end # gitlab:app namespace
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index 1e9b20435ec..5dd8fe8eaa5 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -43,15 +43,8 @@ describe 'gitlab:gitaly namespace rake task' do
     describe 'gmake/make' do
       let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] }
 
-      before(:all) do
-        @old_env_ci = ENV.delete('CI')
-      end
-
-      after(:all) do
-        ENV['CI'] = @old_env_ci if @old_env_ci
-      end
-
       before do
+        stub_env('CI', false)
         FileUtils.mkdir_p(clone_path)
         expect(Dir).to receive(:chdir).with(clone_path).and_call_original
         allow(Bundler).to receive(:bundle_path).and_return('/fake/bundle_path')
diff --git a/spec/tasks/gitlab/ldap_rake_spec.rb b/spec/tasks/gitlab/ldap_rake_spec.rb
index 12d442b9820..279234f2887 100644
--- a/spec/tasks/gitlab/ldap_rake_spec.rb
+++ b/spec/tasks/gitlab/ldap_rake_spec.rb
@@ -4,7 +4,7 @@ describe 'gitlab:ldap:rename_provider rake task' do
   it 'completes without error' do
     Rake.application.rake_require 'tasks/gitlab/ldap'
     stub_warn_user_is_not_gitlab
-    ENV['force'] = 'yes'
+    stub_env('force', 'yes')
 
     create(:identity) # Necessary to prevent `exit 1` from the task.