Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-processesdocs-processes

14 files changed, 434 insertions, 392 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index a0af2dea3ad..baa2b1d8af5 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -44,7 +44,7 @@ describe 'Issue Boards', :js do
     end
 
     it 'creates default lists' do
-      lists = ['Backlog', 'To Do', 'Doing', 'Closed']
+      lists = ['Open', 'To Do', 'Doing', 'Closed']
 
       page.within(find('.board-blank-state')) do
         click_button('Add default lists')
diff --git a/spec/features/commits/user_uses_slash_commands_spec.rb b/spec/features/commits/user_uses_slash_commands_spec.rb
new file mode 100644
index 00000000000..9a4b7bd2444
--- /dev/null
+++ b/spec/features/commits/user_uses_slash_commands_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Commit > User uses quick actions', :js do
+  include Spec::Support::Helpers::Features::NotesHelpers
+  include RepoHelpers
+
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { project.creator }
+  let(:commit) { project.commit }
+
+  before do
+    project.add_maintainer(user)
+    sign_in(user)
+
+    visit project_commit_path(project, commit.id)
+  end
+
+  describe 'Tagging a commit' do
+    let(:tag_name) { 'v1.2.3' }
+    let(:tag_message) { 'Stable release' }
+    let(:truncated_commit_sha) { Commit.truncate_sha(commit.sha) }
+
+    it 'tags this commit' do
+      add_note("/tag #{tag_name} #{tag_message}")
+
+      expect(page).to have_content 'Commands applied'
+      expect(page).to have_content "tagged commit #{truncated_commit_sha}"
+      expect(page).to have_content tag_name
+
+      visit project_tag_path(project, tag_name)
+      expect(page).to have_content tag_name
+      expect(page).to have_content tag_message
+      expect(page).to have_content truncated_commit_sha
+    end
+
+    describe 'preview', :js do
+      it 'removes quick action from note and explains it' do
+        preview_note("/tag #{tag_name} #{tag_message}")
+
+        expect(page).not_to have_content '/tag'
+        expect(page).to have_content %{Tags this commit to #{tag_name} with "#{tag_message}"}
+        expect(page).to have_content tag_name
+      end
+    end
+  end
+end
diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
deleted file mode 100644
index bf60b18873c..00000000000
--- a/spec/features/issues/award_emoji_spec.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-require 'rails_helper'
-
-describe 'Awards Emoji' do
-  let!(:project)   { create(:project, :public) }
-  let!(:user)      { create(:user) }
-  let(:issue) do
-    create(:issue,
-           assignees: [user],
-           project: project)
-  end
-
-  context 'authorized user' do
-    before do
-      project.add_maintainer(user)
-      sign_in(user)
-    end
-
-    describe 'visiting an issue with a legacy award emoji that is not valid anymore' do
-      before do
-        # The `heart_tip` emoji is not valid anymore so we need to skip validation
-        issue.award_emoji.build(user: user, name: 'heart_tip').save!(validate: false)
-        visit project_issue_path(project, issue)
-        wait_for_requests
-      end
-
-      # Regression test: https://gitlab.com/gitlab-org/gitlab-ce/issues/29529
-      it 'does not shows a 500 page', :js do
-        expect(page).to have_text(issue.title)
-      end
-    end
-
-    describe 'Click award emoji from issue#show' do
-      let!(:note) { create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") }
-
-      before do
-        visit project_issue_path(project, issue)
-        wait_for_requests
-      end
-
-      it 'increments the thumbsdown emoji', :js do
-        find('[data-name="thumbsdown"]').click
-        wait_for_requests
-        expect(thumbsdown_emoji).to have_text("1")
-      end
-
-      context 'click the thumbsup emoji' do
-        it 'increments the thumbsup emoji', :js do
-          find('[data-name="thumbsup"]').click
-          wait_for_requests
-          expect(thumbsup_emoji).to have_text("1")
-        end
-
-        it 'decrements the thumbsdown emoji', :js do
-          expect(thumbsdown_emoji).to have_text("0")
-        end
-      end
-
-      context 'click the thumbsdown emoji' do
-        it 'increments the thumbsdown emoji', :js do
-          find('[data-name="thumbsdown"]').click
-          wait_for_requests
-          expect(thumbsdown_emoji).to have_text("1")
-        end
-
-        it 'decrements the thumbsup emoji', :js do
-          expect(thumbsup_emoji).to have_text("0")
-        end
-      end
-
-      it 'toggles the smiley emoji on a note', :js do
-        toggle_smiley_emoji(true)
-
-        within('.note-body') do
-          expect(find(emoji_counter)).to have_text("1")
-        end
-
-        toggle_smiley_emoji(false)
-
-        within('.note-body') do
-          expect(page).not_to have_selector(emoji_counter)
-        end
-      end
-
-      context 'execute /award quick action' do
-        it 'toggles the emoji award on noteable', :js do
-          execute_quick_action('/award :100:')
-
-          expect(find(noteable_award_counter)).to have_text("1")
-
-          execute_quick_action('/award :100:')
-
-          expect(page).not_to have_selector(noteable_award_counter)
-        end
-      end
-    end
-  end
-
-  context 'unauthorized user', :js do
-    before do
-      visit project_issue_path(project, issue)
-    end
-
-    it 'has disabled emoji button' do
-      expect(first('.award-control')[:class]).to have_text('disabled')
-    end
-  end
-
-  def execute_quick_action(cmd)
-    within('.js-main-target-form') do
-      fill_in 'note[note]', with: cmd
-      click_button 'Comment'
-    end
-
-    wait_for_requests
-  end
-
-  def thumbsup_emoji
-    page.all(emoji_counter).first
-  end
-
-  def thumbsdown_emoji
-    page.all(emoji_counter).last
-  end
-
-  def emoji_counter
-    'span.js-counter'
-  end
-
-  def noteable_award_counter
-    ".awards .active"
-  end
-
-  def toggle_smiley_emoji(status)
-    within('.note') do
-      find('.note-emoji-button').click
-    end
-
-    unless status
-      first('[data-name="smiley"]').click
-    else
-      find('[data-name="smiley"]').click
-    end
-
-    wait_for_requests
-  end
-end
diff --git a/spec/features/issues/award_spec.rb b/spec/features/issues/award_spec.rb
deleted file mode 100644
index e53a4ce49c7..00000000000
--- a/spec/features/issues/award_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'rails_helper'
-
-describe 'Issue awards', :js do
-  let(:user)      { create(:user) }
-  let(:project)   { create(:project, :public) }
-  let(:issue)     { create(:issue, project: project) }
-
-  describe 'logged in' do
-    before do
-      sign_in(user)
-      visit project_issue_path(project, issue)
-      wait_for_requests
-    end
-
-    it 'adds award to issue' do
-      first('.js-emoji-btn').click
-      expect(page).to have_selector('.js-emoji-btn.active')
-      expect(first('.js-emoji-btn')).to have_content '1'
-
-      visit project_issue_path(project, issue)
-      expect(first('.js-emoji-btn')).to have_content '1'
-    end
-
-    it 'removes award from issue' do
-      first('.js-emoji-btn').click
-      find('.js-emoji-btn.active').click
-      expect(first('.js-emoji-btn')).to have_content '0'
-
-      visit project_issue_path(project, issue)
-      expect(first('.js-emoji-btn')).to have_content '0'
-    end
-
-    it 'only has one menu on the page' do
-      first('.js-add-award').click
-      expect(page).to have_selector('.emoji-menu')
-
-      expect(page).to have_selector('.emoji-menu', count: 1)
-    end
-  end
-
-  describe 'logged out' do
-    before do
-      visit project_issue_path(project, issue)
-      wait_for_requests
-    end
-
-    it 'does not see award menu button' do
-      expect(page).not_to have_selector('.js-award-holder')
-    end
-  end
-end
diff --git a/spec/features/issues/user_interacts_with_awards_spec.rb b/spec/features/issues/user_interacts_with_awards_spec.rb
new file mode 100644
index 00000000000..afa425c2cec
--- /dev/null
+++ b/spec/features/issues/user_interacts_with_awards_spec.rb
@@ -0,0 +1,347 @@
+require 'spec_helper'
+
+describe 'User interacts with awards' do
+  let(:user) { create(:user) }
+
+  describe 'User interacts with awards in an issue', :js do
+    let(:issue) { create(:issue, project: project)}
+    let(:project) { create(:project) }
+
+    before do
+      project.add_maintainer(user)
+      sign_in(user)
+
+      visit(project_issue_path(project, issue))
+    end
+
+    it 'toggles the thumbsup award emoji' do
+      page.within('.awards') do
+        thumbsup = page.first('.award-control')
+        thumbsup.click
+        thumbsup.hover
+
+        expect(page).to have_selector('.js-emoji-btn')
+        expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
+        expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
+
+        thumbsup = page.first('.award-control')
+        thumbsup.click
+        thumbsup.hover
+
+        expect(page).to have_selector('.award-control.js-emoji-btn')
+        expect(page.all('.award-control.js-emoji-btn').size).to eq(2)
+
+        page.all('.award-control.js-emoji-btn').each do |element|
+          expect(element['title']).to eq('')
+        end
+
+        expect(page.all('.award-control .js-counter')).to all(have_content('0'))
+
+        thumbsup = page.first('.award-control')
+        thumbsup.click
+        thumbsup.hover
+
+        expect(page).to have_selector('.js-emoji-btn')
+        expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
+        expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
+      end
+    end
+
+    it 'toggles a custom award emoji' do
+      page.within('.awards') do
+        page.find('.js-add-award').click
+      end
+
+      page.find('.emoji-menu.is-visible')
+
+      expect(page).to have_selector('.js-emoji-menu-search')
+      expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true)
+
+      page.within('.emoji-menu-content') do
+        emoji_button = page.first('.js-emoji-btn')
+        emoji_button.hover
+        emoji_button.click
+      end
+
+      page.within('.awards') do
+        expect(page).to have_selector('.js-emoji-btn')
+        expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
+        expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
+
+        expect do
+          page.find('.js-emoji-btn.active').click
+          wait_for_requests
+        end.to change { page.all('.award-control.js-emoji-btn').size }.from(3).to(2)
+      end
+    end
+
+    it 'shows the list of award emoji categories' do
+      page.within('.awards') do
+        page.find('.js-add-award').click
+      end
+
+      page.find('.emoji-menu.is-visible')
+
+      expect(page).to have_selector('.js-emoji-menu-search')
+      expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true)
+
+      fill_in('emoji-menu-search', with: 'hand')
+
+      page.within('.emoji-menu-content') do
+        expect(page).to have_selector('[data-name="raised_hand"]')
+      end
+    end
+
+    it 'adds an award emoji by a comment' do
+      page.within('.js-main-target-form') do
+        fill_in('note[note]', with: ':smile:')
+
+        click_button('Comment')
+      end
+
+      expect(page).to have_emoji('smile')
+    end
+
+    context 'when a project is archived' do
+      let(:project) { create(:project, :archived) }
+
+      it 'hides the add award button' do
+        page.within('.awards') do
+          expect(page).not_to have_css('.js-add-award')
+        end
+      end
+    end
+
+    context 'User interacts with awards on a note' do
+      let!(:note) { create(:note, noteable: issue, project: issue.project) }
+      let!(:award_emoji) { create(:award_emoji, awardable: note, name: '100') }
+
+      it 'shows the award on the note' do
+        page.within('.note-awards') do
+          expect(page).to have_emoji('100')
+        end
+      end
+
+      it 'allows adding a vote to an award' do
+        page.within('.note-awards') do
+          find('gl-emoji[data-name="100"]').click
+        end
+        wait_for_requests
+
+        expect(note.reload.award_emoji.size).to eq(2)
+      end
+
+      it 'allows adding a new emoji' do
+        page.within('.note-actions') do
+          find('a.js-add-award').click
+        end
+        page.within('.emoji-menu-content') do
+          find('gl-emoji[data-name="8ball"]').click
+        end
+        wait_for_requests
+
+        page.within('.note-awards') do
+          expect(page).to have_emoji('8ball')
+        end
+        expect(note.reload.award_emoji.size).to eq(2)
+      end
+
+      context 'when the project is archived' do
+        let(:project) { create(:project, :archived) }
+
+        it 'hides the buttons for adding new emoji' do
+          page.within('.note-awards') do
+            expect(page).not_to have_css('.award-menu-holder')
+          end
+
+          page.within('.note-actions') do
+            expect(page).not_to have_css('a.js-add-award')
+          end
+        end
+
+        it 'does not allow toggling existing emoji' do
+          page.within('.note-awards') do
+            find('gl-emoji[data-name="100"]').click
+          end
+          wait_for_requests
+
+          expect(note.reload.award_emoji.size).to eq(1)
+        end
+      end
+    end
+  end
+
+  describe 'User interacts with awards on an issue', :js do
+    let(:project)   { create(:project, :public) }
+    let(:issue)     { create(:issue, project: project) }
+
+    describe 'logged in' do
+      before do
+        sign_in(user)
+        visit project_issue_path(project, issue)
+        wait_for_requests
+      end
+
+      it 'adds award to issue' do
+        first('.js-emoji-btn').click
+
+        expect(page).to have_selector('.js-emoji-btn.active')
+        expect(first('.js-emoji-btn')).to have_content '1'
+
+        visit project_issue_path(project, issue)
+
+        expect(first('.js-emoji-btn')).to have_content '1'
+      end
+
+      it 'removes award from issue' do
+        first('.js-emoji-btn').click
+        find('.js-emoji-btn.active').click
+
+        expect(first('.js-emoji-btn')).to have_content '0'
+
+        visit project_issue_path(project, issue)
+
+        expect(first('.js-emoji-btn')).to have_content '0'
+      end
+
+      it 'only has one menu on the page' do
+        first('.js-add-award').click
+
+        expect(page).to have_selector('.emoji-menu', count: 1)
+      end
+    end
+
+    describe 'logged out' do
+      before do
+        visit project_issue_path(project, issue)
+        wait_for_requests
+      end
+
+      it 'does not see award menu button' do
+        expect(page).not_to have_selector('.js-award-holder')
+      end
+    end
+  end
+
+  describe 'Awards Emoji' do
+    let!(:project)   { create(:project, :public) }
+    let(:issue)      { create(:issue, assignees: [user], project: project) }
+
+    context 'authorized user' do
+      before do
+        project.add_maintainer(user)
+        sign_in(user)
+      end
+
+      describe 'visiting an issue with a legacy award emoji that is not valid anymore' do
+        before do
+          # The `heart_tip` emoji is not valid anymore so we need to skip validation
+          issue.award_emoji.build(user: user, name: 'heart_tip').save!(validate: false)
+          visit project_issue_path(project, issue)
+          wait_for_requests
+        end
+
+        # Regression test: https://gitlab.com/gitlab-org/gitlab-ce/issues/29529
+        it 'does not shows a 500 page', :js do
+          expect(page).to have_text(issue.title)
+        end
+      end
+
+      describe 'Click award emoji from issue#show' do
+        let!(:note) { create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") }
+
+        before do
+          visit project_issue_path(project, issue)
+          wait_for_requests
+        end
+
+        context 'click the thumbsdown emoji' do
+          it 'increments the thumbsdown emoji', :js do
+            find('[data-name="thumbsdown"]').click
+            wait_for_requests
+            expect(thumbsdown_emoji).to have_text("1")
+          end
+
+          it 'decrements the thumbsup emoji', :js do
+            expect(thumbsup_emoji).to have_text("0")
+          end
+        end
+
+        it 'toggles the smiley emoji on a note', :js do
+          toggle_smiley_emoji(true)
+
+          within('.note-body') do
+            expect(find(emoji_counter)).to have_text("1")
+          end
+
+          toggle_smiley_emoji(false)
+
+          within('.note-body') do
+            expect(page).not_to have_selector(emoji_counter)
+          end
+        end
+
+        context 'execute /award quick action' do
+          it 'toggles the emoji award on noteable', :js do
+            execute_quick_action('/award :100:')
+
+            expect(find(noteable_award_counter)).to have_text("1")
+
+            execute_quick_action('/award :100:')
+
+            expect(page).not_to have_selector(noteable_award_counter)
+          end
+        end
+      end
+    end
+
+    context 'unauthorized user', :js do
+      before do
+        visit project_issue_path(project, issue)
+      end
+
+      it 'has disabled emoji button' do
+        expect(first('.award-control')[:class]).to have_text('disabled')
+      end
+    end
+
+    def execute_quick_action(cmd)
+      within('.js-main-target-form') do
+        fill_in 'note[note]', with: cmd
+        click_button 'Comment'
+      end
+
+      wait_for_requests
+    end
+
+    def thumbsup_emoji
+      page.all(emoji_counter).first
+    end
+
+    def thumbsdown_emoji
+      page.all(emoji_counter).last
+    end
+
+    def emoji_counter
+      'span.js-counter'
+    end
+
+    def noteable_award_counter
+      ".awards .active"
+    end
+
+    def toggle_smiley_emoji(status)
+      within('.note') do
+        find('.note-emoji-button').click
+      end
+
+      if !status
+        first('[data-name="smiley"]').click
+      else
+        find('[data-name="smiley"]').click
+      end
+
+      wait_for_requests
+    end
+  end
+end
diff --git a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb
index c1608be402a..fd4175d5227 100644
--- a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb
+++ b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb
@@ -28,7 +28,7 @@ describe 'Merge request > User sees MR with deleted source branch', :js do
     click_on 'Changes'
     wait_for_requests
 
-    expect(page).to have_selector('.diffs.tab-pane .nothing-here-block')
+    expect(page).to have_selector('.diffs.tab-pane .file-holder')
     expect(page).to have_content('Source branch does not exist.')
   end
 end
diff --git a/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb b/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb
deleted file mode 100644
index 4d860893abe..00000000000
--- a/spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-require 'spec_helper'
-
-describe 'User interacts with awards in an issue', :js do
-  let(:issue) { create(:issue, project: project)}
-  let(:project) { create(:project) }
-  let(:user) { create(:user) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-
-    visit(project_issue_path(project, issue))
-  end
-
-  it 'toggles the thumbsup award emoji' do
-    page.within('.awards') do
-      thumbsup = page.first('.award-control')
-      thumbsup.click
-      thumbsup.hover
-
-      expect(page).to have_selector('.js-emoji-btn')
-      expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
-      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
-
-      thumbsup = page.first('.award-control')
-      thumbsup.click
-      thumbsup.hover
-
-      expect(page).to have_selector('.award-control.js-emoji-btn')
-      expect(page.all('.award-control.js-emoji-btn').size).to eq(2)
-
-      page.all('.award-control.js-emoji-btn').each do |element|
-        expect(element['title']).to eq('')
-      end
-
-      page.all('.award-control .js-counter').each do |element|
-        expect(element).to have_content('0')
-      end
-
-      thumbsup = page.first('.award-control')
-      thumbsup.click
-      thumbsup.hover
-
-      expect(page).to have_selector('.js-emoji-btn')
-      expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
-      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
-    end
-  end
-
-  it 'toggles a custom award emoji' do
-    page.within('.awards') do
-      page.find('.js-add-award').click
-    end
-
-    page.find('.emoji-menu.is-visible')
-
-    expect(page).to have_selector('.js-emoji-menu-search')
-    expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true)
-
-    page.within('.emoji-menu-content') do
-      emoji_button = page.first('.js-emoji-btn')
-      emoji_button.hover
-      emoji_button.click
-    end
-
-    page.within('.awards') do
-      expect(page).to have_selector('.js-emoji-btn')
-      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content('1')
-      expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
-
-      expect do
-        page.find('.js-emoji-btn.active').click
-        wait_for_requests
-      end.to change { page.all('.award-control.js-emoji-btn').size }.from(3).to(2)
-    end
-  end
-
-  it 'shows the list of award emoji categories' do
-    page.within('.awards') do
-      page.find('.js-add-award').click
-    end
-
-    page.find('.emoji-menu.is-visible')
-
-    expect(page).to have_selector('.js-emoji-menu-search')
-    expect(page.evaluate_script("document.activeElement.classList.contains('js-emoji-menu-search')")).to eq(true)
-
-    fill_in('emoji-menu-search', with: 'hand')
-
-    page.within('.emoji-menu-content') do
-      expect(page).to have_selector('[data-name="raised_hand"]')
-    end
-  end
-
-  it 'adds an award emoji by a comment' do
-    page.within('.js-main-target-form') do
-      fill_in('note[note]', with: ':smile:')
-
-      click_button('Comment')
-    end
-
-    expect(page).to have_emoji('smile')
-  end
-
-  context 'when a project is archived' do
-    let(:project) { create(:project, :archived) }
-
-    it 'hides the add award button' do
-      page.within('.awards') do
-        expect(page).not_to have_css('.js-add-award')
-      end
-    end
-  end
-
-  context 'awards on a note' do
-    let!(:note) { create(:note, noteable: issue, project: issue.project) }
-    let!(:award_emoji) { create(:award_emoji, awardable: note, name: '100') }
-
-    it 'shows the award on the note' do
-      page.within('.note-awards') do
-        expect(page).to have_emoji('100')
-      end
-    end
-
-    it 'allows adding a vote to an award' do
-      page.within('.note-awards') do
-        find('gl-emoji[data-name="100"]').click
-      end
-      wait_for_requests
-
-      expect(note.reload.award_emoji.size).to eq(2)
-    end
-
-    it 'allows adding a new emoji' do
-      page.within('.note-actions') do
-        find('a.js-add-award').click
-      end
-      page.within('.emoji-menu-content') do
-        find('gl-emoji[data-name="8ball"]').click
-      end
-      wait_for_requests
-
-      page.within('.note-awards') do
-        expect(page).to have_emoji('8ball')
-      end
-      expect(note.reload.award_emoji.size).to eq(2)
-    end
-
-    context 'when the project is archived' do
-      let(:project) { create(:project, :archived) }
-
-      it 'hides the buttons for adding new emoji' do
-        page.within('.note-awards') do
-          expect(page).not_to have_css('.award-menu-holder')
-        end
-
-        page.within('.note-actions') do
-          expect(page).not_to have_css('a.js-add-award')
-        end
-      end
-
-      it 'does not allow toggling existing emoji' do
-        page.within('.note-awards') do
-          find('gl-emoji[data-name="100"]').click
-        end
-        wait_for_requests
-
-        expect(note.reload.award_emoji.size).to eq(1)
-      end
-    end
-  end
-end
diff --git a/spec/features/projects/blobs/shortcuts_blob_spec.rb b/spec/features/projects/blobs/shortcuts_blob_spec.rb
index aeed38aeb76..3925de6cfb9 100644
--- a/spec/features/projects/blobs/shortcuts_blob_spec.rb
+++ b/spec/features/projects/blobs/shortcuts_blob_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Blob shortcuts' do
+describe 'Blob shortcuts', :js do
   include TreeHelper
   let(:project) { create(:project, :public, :repository) }
   let(:path) { project.repository.ls_files(project.repository.root_ref)[0] }
@@ -18,6 +18,7 @@ describe 'Blob shortcuts' do
     describe 'pressing "y"' do
       it 'redirects to permalink with commit sha' do
         visit_blob
+        wait_for_requests
 
         find('body').native.send_key('y')
 
@@ -27,6 +28,7 @@ describe 'Blob shortcuts' do
       it 'maintains fragment hash when redirecting' do
         fragment = "L1"
         visit_blob(fragment)
+        wait_for_requests
 
         find('body').native.send_key('y')
 
diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
index f56174fc85c..f3cf3a282e5 100644
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -210,9 +210,10 @@ describe "User browses files" do
     end
   end
 
-  context "when browsing a file content" do
+  context "when browsing a file content", :js do
     before do
       visit(tree_path_root_ref)
+      wait_for_requests
 
       click_link(".gitignore")
     end
diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
index 0e9f83a16ce..dcb7b947c61 100644
--- a/spec/features/projects/files/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Projects > Files > User deletes files' do
+describe 'Projects > Files > User deletes files', :js do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
@@ -19,6 +19,7 @@ describe 'Projects > Files > User deletes files' do
     before do
       project.add_maintainer(user)
       visit(project_tree_path_root_ref)
+      wait_for_requests
     end
 
     it 'deletes the file', :js do
@@ -35,10 +36,11 @@ describe 'Projects > Files > User deletes files' do
     end
   end
 
-  context 'when an user does not have write access' do
+  context 'when an user does not have write access', :js do
     before do
       project2.add_reporter(user)
       visit(project2_tree_path_root_ref)
+      wait_for_requests
     end
 
     it 'deletes the file in a forked project', :js do
diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
index ccc1bc1bc10..9eb65ec159c 100644
--- a/spec/features/projects/files/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Projects > Files > User edits files' do
+describe 'Projects > Files > User edits files', :js do
   include ProjectForksHelper
   let(:project) { create(:project, :repository, name: 'Shop') }
   let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
@@ -29,13 +29,14 @@ describe 'Projects > Files > User edits files' do
     end
   end
 
-  context 'when an user has write access' do
+  context 'when an user has write access', :js do
     before do
       project.add_maintainer(user)
       visit(project_tree_path_root_ref)
+      wait_for_requests
     end
 
-    it 'inserts a content of a file', :js do
+    it 'inserts a content of a file' do
       click_link('.gitignore')
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
@@ -49,13 +50,14 @@ describe 'Projects > Files > User edits files' do
     it 'does not show the edit link if a file is binary' do
       binary_file = File.join(project.repository.root_ref, 'files/images/logo-black.png')
       visit(project_blob_path(project, binary_file))
+      wait_for_requests
 
       page.within '.content' do
         expect(page).not_to have_link('edit')
       end
     end
 
-    it 'commits an edited file', :js do
+    it 'commits an edited file' do
       click_link('.gitignore')
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
@@ -72,7 +74,7 @@ describe 'Projects > Files > User edits files' do
       expect(page).to have_content('*.rbca')
     end
 
-    it 'commits an edited file to a new branch', :js do
+    it 'commits an edited file to a new branch' do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
@@ -91,7 +93,7 @@ describe 'Projects > Files > User edits files' do
       expect(page).to have_content('*.rbca')
     end
 
-    it 'shows the diff of an edited file', :js do
+    it 'shows the diff of an edited file' do
       click_link('.gitignore')
       find('.js-edit-blob').click
       find('.file-editor', match: :first)
@@ -106,13 +108,14 @@ describe 'Projects > Files > User edits files' do
     it_behaves_like 'unavailable for an archived project'
   end
 
-  context 'when an user does not have write access' do
+  context 'when an user does not have write access', :js do
     before do
       project2.add_reporter(user)
       visit(project2_tree_path_root_ref)
+      wait_for_requests
     end
 
-    it 'inserts a content of a file in a forked project', :js do
+    it 'inserts a content of a file in a forked project' do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
@@ -134,7 +137,7 @@ describe 'Projects > Files > User edits files' do
       expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
     end
 
-    it 'commits an edited file in a forked project', :js do
+    it 'commits an edited file in a forked project' do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
@@ -163,6 +166,7 @@ describe 'Projects > Files > User edits files' do
       let!(:forked_project) { fork_project(project2, user, namespace: user.namespace, repository: true) }
       before do
         visit(project2_tree_path_root_ref)
+        wait_for_requests
       end
 
       it 'links to the forked project for editing' do
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index 3a81e77c4ba..e3da28d73c3 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Projects > Files > User replaces files' do
+describe 'Projects > Files > User replaces files', :js do
   include DropzoneHelper
 
   let(:fork_message) do
@@ -21,9 +21,10 @@ describe 'Projects > Files > User replaces files' do
     before do
       project.add_maintainer(user)
       visit(project_tree_path_root_ref)
+      wait_for_requests
     end
 
-    it 'replaces an existed file with a new one', :js do
+    it 'replaces an existed file with a new one' do
       click_link('.gitignore')
 
       expect(page).to have_content('.gitignore')
@@ -47,9 +48,10 @@ describe 'Projects > Files > User replaces files' do
     before do
       project2.add_reporter(user)
       visit(project2_tree_path_root_ref)
+      wait_for_requests
     end
 
-    it 'replaces an existed file with a new one in a forked project', :js do
+    it 'replaces an existed file with a new one in a forked project' do
       click_link('.gitignore')
 
       expect(page).to have_content('.gitignore')
diff --git a/spec/features/projects/remote_mirror_spec.rb b/spec/features/projects/remote_mirror_spec.rb
index 5259a8942dc..33e9b73efe8 100644
--- a/spec/features/projects/remote_mirror_spec.rb
+++ b/spec/features/projects/remote_mirror_spec.rb
@@ -17,7 +17,7 @@ describe 'Project remote mirror', :feature do
 
         visit project_mirror_path(project)
 
-        expect(page).to have_content('The remote repository failed to update.')
+        expect_mirror_to_have_error_and_timeago('Never')
       end
     end
 
@@ -27,8 +27,14 @@ describe 'Project remote mirror', :feature do
 
         visit project_mirror_path(project)
 
-        expect(page).to have_content('The remote repository failed to update 5 minutes ago.')
+        expect_mirror_to_have_error_and_timeago('5 minutes ago')
       end
     end
+
+    def expect_mirror_to_have_error_and_timeago(timeago)
+      row = first('.js-mirrors-table-body tr')
+      expect(row).to have_content('Error')
+      expect(row).to have_content(timeago)
+    end
   end
 end
diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb
index a0f5b234ebc..377a75cbcb3 100644
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
@@ -129,9 +129,8 @@ describe 'Projects > Settings > Repository settings' do
         visit project_settings_repository_path(project)
       end
 
-      it 'shows push mirror settings' do
-        expect(page).to have_selector('#project_remote_mirrors_attributes_0_enabled')
-        expect(page).to have_selector('#project_remote_mirrors_attributes_0_url')
+      it 'shows push mirror settings', :js do
+        expect(page).to have_selector('#mirror_direction')
       end
     end
   end