Merge branch 'master' into issue-discussions-refactor

# Conflicts:
#	app/models/issue.rb

8 files changed, 21 insertions, 20 deletions

diff --git a/spec/support/api_helpers.rb b/spec/support/api_helpers.rb
index ac0aaa524b7..01aca74274c 100644
--- a/spec/support/api_helpers.rb
+++ b/spec/support/api_helpers.rb
@@ -45,18 +45,4 @@ module ApiHelpers
       oauth_access_token: oauth_access_token
     )
   end
-
-  def ci_api(path, user = nil)
-    "/ci/api/v1/#{path}" +
-
-      # Normalize query string
-      (path.index('?') ? '' : '?') +
-
-      # Append private_token if given a User object
-      if user.respond_to?(:private_token)
-        "&private_token=#{user.private_token}"
-      else
-        ''
-      end
-  end
 end
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb
index 30911e7fa86..39586d37e93 100644
--- a/spec/support/cycle_analytics_helpers.rb
+++ b/spec/support/cycle_analytics_helpers.rb
@@ -78,6 +78,8 @@ module CycleAnalyticsHelpers
     @dummy_pipeline ||=
       Ci::Pipeline.new(
         sha: project.repository.commit('master').sha,
+        ref: 'master',
+        source: :push,
         project: project)
   end
 
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index b0f520d08e8..edaee03ea6c 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -4,18 +4,18 @@ RSpec.configure do |config|
   end
 
   config.append_after(:context) do
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.clean_with(:truncation, cache_tables: false)
   end
 
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, js: true) do
+  config.before(:each, :js) do
     DatabaseCleaner.strategy = :truncation
   end
 
-  config.before(:each, truncate: true) do
+  config.before(:each, :truncate) do
     DatabaseCleaner.strategy = :truncation
   end
 
diff --git a/spec/support/features/reportable_note_shared_examples.rb b/spec/support/features/reportable_note_shared_examples.rb
index d10006edd85..192a2fed0a8 100644
--- a/spec/support/features/reportable_note_shared_examples.rb
+++ b/spec/support/features/reportable_note_shared_examples.rb
@@ -39,7 +39,7 @@ shared_examples 'reportable note' do |type|
   end
 
   def open_dropdown(dropdown)
-    dropdown.click
+    dropdown.find('.more-actions-toggle').trigger('click')
     dropdown.find('.dropdown-menu li', match: :first)
   end
 end
diff --git a/spec/support/filtered_search_helpers.rb b/spec/support/filtered_search_helpers.rb
index 99b8b6b7ea4..05021ea9054 100644
--- a/spec/support/filtered_search_helpers.rb
+++ b/spec/support/filtered_search_helpers.rb
@@ -58,11 +58,17 @@ module FilteredSearchHelpers
       page.all(:css, '.tokens-container li .selectable').each_with_index do |el, index|
         token_name = tokens[index][:name]
         token_value = tokens[index][:value]
+        token_emoji = tokens[index][:emoji_name]
 
         expect(el.find('.name')).to have_content(token_name)
         if token_value
           expect(el.find('.value')).to have_content(token_value)
         end
+        # gl-emoji content is blank when the emoji unicode is not supported
+        if token_emoji
+          selector = %(gl-emoji[data-name="#{token_emoji}"])
+          expect(el.find('.value')).to have_css(selector)
+        end
       end
     end
   end
@@ -89,6 +95,10 @@ module FilteredSearchHelpers
     create_token('Label', label_name, symbol)
   end
 
+  def emoji_token(emoji_name = nil)
+    { name: 'My-Reaction', emoji_name: emoji_name }
+  end
+
   def default_placeholder
     'Search or filter results...'
   end
diff --git a/spec/support/helpers/note_interaction_helpers.rb b/spec/support/helpers/note_interaction_helpers.rb
index 551c759133c..86008698692 100644
--- a/spec/support/helpers/note_interaction_helpers.rb
+++ b/spec/support/helpers/note_interaction_helpers.rb
@@ -2,7 +2,7 @@ module NoteInteractionHelpers
   def open_more_actions_dropdown(note)
     note_element = find("#note_#{note.id}")
 
-    note_element.find('.more-actions').click
+    note_element.find('.more-actions-toggle').trigger('click')
     note_element.find('.more-actions .dropdown-menu li', match: :first)
   end
 end
diff --git a/spec/support/import_export/export_file_helper.rb b/spec/support/import_export/export_file_helper.rb
index 2011408be93..562423afc2a 100644
--- a/spec/support/import_export/export_file_helper.rb
+++ b/spec/support/import_export/export_file_helper.rb
@@ -35,7 +35,8 @@ module ExportFileHelper
            project: project,
            commit_id: ci_pipeline.sha)
 
-    create(:event, :created, target: milestone, project: project, author: user)
+    event = create(:event, :created, target: milestone, project: project, author: user, action: 5)
+    create(:push_event_payload, event: event)
     create(:project_member, :master, user: user, project: project)
     create(:ci_variable, project: project)
     create(:ci_trigger, project: project)
diff --git a/spec/support/migrations_helpers.rb b/spec/support/migrations_helpers.rb
index 255b3d96a62..4ca019c1b05 100644
--- a/spec/support/migrations_helpers.rb
+++ b/spec/support/migrations_helpers.rb
@@ -16,6 +16,8 @@ module MigrationsHelpers
   end
 
   def reset_column_in_migration_models
+    ActiveRecord::Base.clear_cache!
+
     described_class.constants.sort.each do |name|
       const = described_class.const_get(name)