Merge branch 'master' into 'balsalmiq-support'

# Conflicts:
#   config/webpack.config.js

12 files changed, 337 insertions, 12 deletions

diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
new file mode 100644
index 00000000000..bb4542b1683
--- /dev/null
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -0,0 +1,219 @@
+shared_examples 'discussion comments' do |resource_name|
+  let(:form_selector) { '.js-main-target-form' }
+  let(:dropdown_selector) { "#{form_selector} .comment-type-dropdown" }
+  let(:toggle_selector) { "#{dropdown_selector} .dropdown-toggle" }
+  let(:menu_selector) { "#{dropdown_selector} .dropdown-menu" }
+  let(:submit_selector) { "#{form_selector} .js-comment-submit-button" }
+  let(:close_selector) { "#{form_selector} .btn-comment-and-close" }
+  let(:comments_selector) { '.timeline > .note.timeline-entry' }
+
+  it 'clicking "Comment" will post a comment' do
+    expect(page).to have_selector toggle_selector
+
+    find("#{form_selector} .note-textarea").send_keys('a')
+
+    find(submit_selector).click
+
+    find(comments_selector, match: :first)
+    new_comment = all(comments_selector).last
+
+    expect(new_comment).to have_content 'a'
+    expect(new_comment).not_to have_selector '.discussion'
+  end
+
+  if resource_name == 'issue'
+    it "clicking 'Comment & close #{resource_name}' will post a comment and close the #{resource_name}" do
+      find("#{form_selector} .note-textarea").send_keys('a')
+
+      find(close_selector).click
+
+      find(comments_selector, match: :first)
+      find("#{comments_selector}.system-note")
+      entries = all(comments_selector)
+      close_note = entries.last
+      new_comment = entries[-2]
+
+      expect(close_note).to have_content 'closed'
+      expect(new_comment).not_to have_selector '.discussion'
+    end
+  end
+
+  describe 'when the toggle is clicked' do
+    before do
+      find("#{form_selector} .note-textarea").send_keys('a')
+
+      find(toggle_selector).click
+    end
+
+    it 'has a "Comment" item (selected by default) and "Start discussion" item' do
+      expect(page).to have_selector menu_selector
+
+      find("#{menu_selector} li", match: :first)
+      items = all("#{menu_selector} li")
+
+      expect(items.first).to have_content 'Comment'
+      expect(items.first).to have_content "Add a general comment to this #{resource_name}."
+      expect(items.first).to have_selector '.fa-check'
+      expect(items.first['class']).to match 'droplab-item-selected'
+
+      expect(items.last).to have_content 'Start discussion'
+      expect(items.last).to have_content "Discuss a specific suggestion or question#{' that needs to be resolved' if resource_name == 'merge request'}."
+      expect(items.last).not_to have_selector '.fa-check'
+      expect(items.last['class']).not_to match 'droplab-item-selected'
+    end
+
+    it 'closes the menu when clicking the toggle or body' do
+      find(toggle_selector).click
+
+      expect(page).not_to have_selector menu_selector
+
+      find(toggle_selector).click
+      find('body').click
+
+      expect(page).not_to have_selector menu_selector
+    end
+
+    it 'clicking the ul padding or divider should not change the text' do
+      find(menu_selector).trigger 'click'
+
+      expect(page).to have_selector menu_selector
+      expect(find(dropdown_selector)).to have_content 'Comment'
+
+      find("#{menu_selector} .divider").trigger 'click'
+
+      expect(page).to have_selector menu_selector
+      expect(find(dropdown_selector)).to have_content 'Comment'
+    end
+
+    describe 'when selecting "Start discussion"' do
+      before do
+        find("#{menu_selector} li", match: :first)
+        all("#{menu_selector} li").last.click
+      end
+
+      it 'updates the submit button text, note_type input and closes the dropdown' do
+        expect(find(dropdown_selector)).to have_content 'Start discussion'
+        expect(find("#{form_selector} #note_type", visible: false).value).to eq('DiscussionNote')
+        expect(page).not_to have_selector menu_selector
+      end
+
+      if resource_name =~ /(issue|merge request)/
+        it 'updates the close button text' do
+          expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}"
+        end
+
+        it 'typing does not change the close button text' do
+          find("#{form_selector} .note-textarea").send_keys('b')
+
+          expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}"
+        end
+      end
+
+      it 'clicking "Start discussion" will post a discussion' do
+        find(submit_selector).click
+
+        find(comments_selector, match: :first)
+        new_comment = all(comments_selector).last
+
+        expect(new_comment).to have_content 'a'
+        expect(new_comment).to have_selector '.discussion'
+      end
+
+      if resource_name == 'issue'
+        it "clicking 'Start discussion & close #{resource_name}' will post a discussion and close the #{resource_name}" do
+          find(close_selector).click
+
+          find(comments_selector, match: :first)
+          find("#{comments_selector}.system-note")
+          entries = all(comments_selector)
+          close_note = entries.last
+          new_discussion = entries[-2]
+
+          expect(close_note).to have_content 'closed'
+          expect(new_discussion).to have_selector '.discussion'
+        end
+      end
+
+      describe 'when opening the menu' do
+        before do
+          find(toggle_selector).click
+        end
+
+        it 'should have "Start discussion" selected' do
+          find("#{menu_selector} li", match: :first)
+          items = all("#{menu_selector} li")
+
+          expect(items.first).to have_content 'Comment'
+          expect(items.first).not_to have_selector '.fa-check'
+          expect(items.first['class']).not_to match 'droplab-item-selected'
+
+          expect(items.last).to have_content 'Start discussion'
+          expect(items.last).to have_selector '.fa-check'
+          expect(items.last['class']).to match 'droplab-item-selected'
+        end
+
+        describe 'when selecting "Comment"' do
+          before do
+            find("#{menu_selector} li", match: :first).click
+          end
+
+          it 'updates the submit button text, clears the note_type input and closes the dropdown' do
+            expect(find(dropdown_selector)).to have_content 'Comment'
+            expect(find("#{form_selector} #note_type", visible: false).value).to eq('')
+            expect(page).not_to have_selector menu_selector
+          end
+
+          if resource_name =~ /(issue|merge request)/
+            it 'updates the close button text' do
+              expect(find(close_selector)).to have_content "Comment & close #{resource_name}"
+            end
+
+            it 'typing does not change the close button text' do
+              find("#{form_selector} .note-textarea").send_keys('b')
+
+              expect(find(close_selector)).to have_content "Comment & close #{resource_name}"
+            end
+          end
+
+          it 'should have "Comment" selected when opening the menu' do
+            find(toggle_selector).click
+
+            find("#{menu_selector} li", match: :first)
+            items = all("#{menu_selector} li")
+
+            expect(items.first).to have_content 'Comment'
+            expect(items.first).to have_selector '.fa-check'
+            expect(items.first['class']).to match 'droplab-item-selected'
+
+            expect(items.last).to have_content 'Start discussion'
+            expect(items.last).not_to have_selector '.fa-check'
+            expect(items.last['class']).not_to match 'droplab-item-selected'
+          end
+        end
+      end
+    end
+  end
+
+  if resource_name =~ /(issue|merge request)/
+    describe "on a closed #{resource_name}" do
+      before do
+        find("#{form_selector} .js-note-target-close").click
+
+        find("#{form_selector} .note-textarea").send_keys('a')
+      end
+
+      it "should show a 'Comment & reopen #{resource_name}' button" do
+        expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Comment & reopen #{resource_name}"
+      end
+
+      it "should show a 'Start discussion & reopen #{resource_name}' button when 'Start discussion' is selected" do
+        find(toggle_selector).click
+
+        find("#{menu_selector} li", match: :first)
+        all("#{menu_selector} li").last.click
+
+        expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Start discussion & reopen #{resource_name}"
+      end
+    end
+  end
+end
diff --git a/spec/support/features/issuable_slash_commands_shared_examples.rb b/spec/support/features/issuable_slash_commands_shared_examples.rb
index a4713e53f63..5bbe36d9b7f 100644
--- a/spec/support/features/issuable_slash_commands_shared_examples.rb
+++ b/spec/support/features/issuable_slash_commands_shared_examples.rb
@@ -3,7 +3,6 @@
 
 shared_examples 'issuable record that supports slash commands in its description and notes' do |issuable_type|
   include SlashCommandsHelpers
-  include WaitForAjax
 
   let(:master) { create(:user) }
   let(:assignee) { create(:user, username: 'bob') }
diff --git a/spec/support/fixture_helpers.rb b/spec/support/fixture_helpers.rb
index a05c9d18002..5515c355cea 100644
--- a/spec/support/fixture_helpers.rb
+++ b/spec/support/fixture_helpers.rb
@@ -1,8 +1,11 @@
 module FixtureHelpers
   def fixture_file(filename)
     return '' if filename.blank?
-    file_path = File.expand_path(Rails.root.join('spec/fixtures/', filename))
-    File.read(file_path)
+    File.read(expand_fixture_path(filename))
+  end
+
+  def expand_fixture_path(filename)
+    File.expand_path(Rails.root.join('spec/fixtures/', filename))
   end
 end
 
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb
new file mode 100644
index 00000000000..7aca902fc61
--- /dev/null
+++ b/spec/support/gitaly.rb
@@ -0,0 +1,7 @@
+if Gitlab::GitalyClient.enabled?
+  RSpec.configure do |config|
+    config.before(:each) do
+      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true)
+    end
+  end
+end
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index 9ffb00be0b8..e6da852e728 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -84,8 +84,4 @@ module LoginHelpers
   def logout_direct
     page.driver.submit :delete, '/users/sign_out', {}
   end
-
-  def skip_ci_admin_auth
-    allow_any_instance_of(Ci::Admin::ApplicationController).to receive_messages(authenticate_admin!: true)
-  end
 end
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index dea0015f105..21a054af4e1 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -23,7 +23,7 @@ class MarkdownFeature
   # Direct references ----------------------------------------------------------
 
   def project
-    @project ||= create(:project).tap do |project|
+    @project ||= create(:project, :repository).tap do |project|
       project.team << [user, :master]
     end
   end
@@ -80,7 +80,7 @@ class MarkdownFeature
   def xproject
     @xproject ||= begin
       group = create(:group, :nested)
-      create(:project, namespace: group) do |project|
+      create(:project, :repository, namespace: group) do |project|
         project.team << [user, :developer]
       end
     end
diff --git a/spec/support/matchers/user_activity_matchers.rb b/spec/support/matchers/user_activity_matchers.rb
new file mode 100644
index 00000000000..ce3b683b6d2
--- /dev/null
+++ b/spec/support/matchers/user_activity_matchers.rb
@@ -0,0 +1,5 @@
+RSpec::Matchers.define :have_an_activity_record do |expected|
+  match do |user|
+    expect(Gitlab::UserActivities.new.find { |k, _| k == user.id.to_s }).to be_present
+  end
+end
diff --git a/spec/support/mobile_helpers.rb b/spec/support/mobile_helpers.rb
index 20d5849bcab..431f20a2a5c 100644
--- a/spec/support/mobile_helpers.rb
+++ b/spec/support/mobile_helpers.rb
@@ -1,4 +1,8 @@
 module MobileHelpers
+  def resize_screen_xs
+    resize_window(767, 768)
+  end
+
   def resize_screen_sm
     resize_window(900, 768)
   end
diff --git a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
index 0eac587e973..dcc562c684b 100644
--- a/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
+++ b/spec/support/services/migrate_to_ghost_user_service_shared_examples.rb
@@ -35,5 +35,57 @@ shared_examples "migrating a deleted user's associated records to the ghost user
 
       expect(user).to be_blocked
     end
+
+    context "race conditions" do
+      context "when #{record_class_name} migration fails and is rolled back" do
+        before do
+          expect_any_instance_of(record_class::ActiveRecord_Associations_CollectionProxy)
+            .to receive(:update_all).and_raise(ActiveRecord::Rollback)
+        end
+
+        it 'rolls back the user block' do
+          service.execute
+
+          expect(user.reload).not_to be_blocked
+        end
+
+        it "doesn't unblock an previously-blocked user" do
+          user.block
+
+          service.execute
+
+          expect(user.reload).to be_blocked
+        end
+      end
+
+      context "when #{record_class_name} migration fails with a non-rollback exception" do
+        before do
+          expect_any_instance_of(record_class::ActiveRecord_Associations_CollectionProxy)
+            .to receive(:update_all).and_raise(ArgumentError)
+        end
+
+        it 'rolls back the user block' do
+          service.execute rescue nil
+
+          expect(user.reload).not_to be_blocked
+        end
+
+        it "doesn't unblock an previously-blocked user" do
+          user.block
+
+          service.execute rescue nil
+
+          expect(user.reload).to be_blocked
+        end
+      end
+
+      it "blocks the user before #{record_class_name} migration begins" do
+        expect(service).to receive("migrate_#{record_class_name.parameterize('_')}s".to_sym) do
+          expect(user.reload).to be_blocked
+        end
+
+        service.execute
+      end
+    end
   end
 end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 5765a31ca18..d498ddafd08 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -39,7 +39,8 @@ module TestEnv
     'deleted-image-test'                 => '6c17798',
     'wip'                                => 'b9238ee',
     'csv'                                => '3dd0896',
-    'v1.1.0'                             => 'b83d6e3'
+    'v1.1.0'                             => 'b83d6e3',
+    'add-ipython-files'                  => '6d85bb69'
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
@@ -65,6 +66,8 @@ module TestEnv
     # Setup GitLab shell for test instance
     setup_gitlab_shell
 
+    setup_gitaly if Gitlab::GitalyClient.enabled?
+
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo
 
@@ -72,6 +75,10 @@ module TestEnv
     setup_forked_repo
   end
 
+  def cleanup
+    stop_gitaly
+  end
+
   def disable_mailer
     allow_any_instance_of(NotificationService).to receive(:mailer).
       and_return(double.as_null_object)
@@ -93,7 +100,7 @@ module TestEnv
     tmp_test_path = Rails.root.join('tmp', 'tests', '**')
 
     Dir[tmp_test_path].each do |entry|
-      unless File.basename(entry) =~ /\Agitlab-(shell|test|test_bare|test-fork|test-fork_bare)\z/
+      unless File.basename(entry) =~ /\A(gitaly|gitlab-(shell|test|test_bare|test-fork|test-fork_bare))\z/
         FileUtils.rm_rf(entry)
       end
     end
@@ -111,6 +118,29 @@ module TestEnv
     end
   end
 
+  def setup_gitaly
+    socket_path = Gitlab::GitalyClient.get_address('default').sub(/\Aunix:/, '')
+    gitaly_dir = File.dirname(socket_path)
+
+    unless File.directory?(gitaly_dir) || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]")
+      raise "Can't clone gitaly"
+    end
+
+    start_gitaly(gitaly_dir)
+  end
+
+  def start_gitaly(gitaly_dir)
+    gitaly_exec = File.join(gitaly_dir, 'gitaly')
+    gitaly_config = File.join(gitaly_dir, 'config.toml')
+    @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => '/dev/null')
+  end
+
+  def stop_gitaly
+    return unless @gitaly_pid
+
+    Process.kill('KILL', @gitaly_pid)
+  end
+
   def setup_factory_repo
     setup_repo(factory_repo_path, factory_repo_path_bare, factory_repo_name,
                BRANCH_SHA)
diff --git a/spec/support/user_activities_helpers.rb b/spec/support/user_activities_helpers.rb
new file mode 100644
index 00000000000..f7ca9a31edd
--- /dev/null
+++ b/spec/support/user_activities_helpers.rb
@@ -0,0 +1,7 @@
+module UserActivitiesHelpers
+  def user_activity(user)
+    Gitlab::UserActivities.new.
+      find { |k, _| k == user.id.to_s }&.
+      second
+  end
+end
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb
index 0f9dc2dee75..508de2ee8e1 100644
--- a/spec/support/wait_for_ajax.rb
+++ b/spec/support/wait_for_ajax.rb
@@ -6,10 +6,13 @@ module WaitForAjax
   end
 
   def finished_all_ajax_requests?
+    return true unless javascript_test?
+    return true if page.evaluate_script('typeof jQuery === "undefined"')
+
     page.evaluate_script('jQuery.active').zero?
   end
 
   def javascript_test?
-    [:selenium, :webkit, :chrome, :poltergeist].include?(Capybara.current_driver)
+    Capybara.current_driver == Capybara.javascript_driver
   end
 end