Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

* upstream/master: (126 commits)
  Update VERSION to 10.3.0-pre
  Update CHANGELOG.md for 10.2.0
  default fill color for SVGs
  ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`
  Use Redis cache for branch existence checks
  Update CONTRIBUTING.md: Link definition of done to criteria
  Use `make install` for Gitaly setups in non-test environments
  FileUploader should check for hashed_storage?(:attachments) to use disk_path
  Set the default gitlab-shell timeout to 3 hours
  Update composite pipelines index to include "id"
  Use arrays in Pipeline#latest_builds_with_artifacts
  Fix blank states using old css
  Skip confirmation user api
  Custom issue tracker
  Revert "check for `read_only?` first before seeing if request is disallowed"
  add `#with_metadata` scope to remove a N+1 from the notes' API
  Fix promoting milestone updating all issuables without milestone
  Batchload blobs for diff generation
  check for `read_only?` first before seeing if request is disallowed
  use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
  ...

3 files changed, 229 insertions, 44 deletions

diff --git a/spec/rubocop/cop/line_break_after_guard_clauses_spec.rb b/spec/rubocop/cop/line_break_after_guard_clauses_spec.rb
new file mode 100644
index 00000000000..8899dc85384
--- /dev/null
+++ b/spec/rubocop/cop/line_break_after_guard_clauses_spec.rb
@@ -0,0 +1,160 @@
+require 'spec_helper'
+require 'rubocop'
+require 'rubocop/rspec/support'
+require_relative '../../../rubocop/cop/line_break_after_guard_clauses'
+
+describe RuboCop::Cop::LineBreakAfterGuardClauses do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  shared_examples 'examples with guard clause' do |title|
+    %w[if unless].each do |conditional|
+      it "flags violation for #{title} #{conditional} without line breaks" do
+        source = <<~RUBY
+          #{title} #{conditional} condition
+          do_stuff
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses.size).to eq(1)
+        offense = cop.offenses.first
+
+        expect(offense.line).to eq(1)
+        expect(cop.highlights).to eq(["#{title} #{conditional} condition"])
+        expect(offense.message).to eq('Add a line break after guard clauses')
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} with line break" do
+        source = <<~RUBY
+          #{title} #{conditional} condition
+
+          do_stuff
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} on multiple lines without line break" do
+        source = <<~RUBY
+          #{conditional} condition
+            #{title}
+          end
+          do_stuff
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by end keyword" do
+        source = <<~RUBY
+          def test
+            #{title} #{conditional} condition
+          end
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by elsif keyword" do
+        source = <<~RUBY
+          if model
+            #{title} #{conditional} condition
+          elsif
+            do_something
+          end
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by else keyword" do
+        source = <<~RUBY
+          if model
+            #{title} #{conditional} condition
+          else
+            do_something
+          end
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by when keyword" do
+        source = <<~RUBY
+          case model
+            when condition_a
+              #{title} #{conditional} condition
+            when condition_b
+              do_something
+            end
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by rescue keyword" do
+        source = <<~RUBY
+          begin
+            #{title} #{conditional} condition
+          rescue StandardError
+            do_something
+          end
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by ensure keyword" do
+        source = <<~RUBY
+          def foo
+            #{title} #{conditional} condition
+          ensure
+            do_something
+          end
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "doesn't flag violation for #{title} #{conditional} without line breaks when followed by another guard clause" do
+        source = <<~RUBY
+          #{title} #{conditional} condition
+          #{title} #{conditional} condition
+
+          do_stuff
+        RUBY
+        inspect_source(cop, source)
+
+        expect(cop.offenses).to be_empty
+      end
+
+      it "autocorrects #{title} #{conditional} guard clauses without line break" do
+        source = <<~RUBY
+          #{title} #{conditional} condition
+          do_stuff
+        RUBY
+        autocorrected = autocorrect_source(cop, source)
+
+        expected_source = <<~RUBY
+          #{title} #{conditional} condition
+
+          do_stuff
+        RUBY
+        expect(autocorrected).to eql(expected_source)
+      end
+    end
+  end
+
+  %w[return fail raise next break throw].each do |example|
+    it_behaves_like 'examples with guard clause', example
+  end
+end
diff --git a/spec/rubocop/cop/migration/add_column_with_default_to_large_table_spec.rb b/spec/rubocop/cop/migration/add_column_with_default_to_large_table_spec.rb
deleted file mode 100644
index 07cb3fc4a2e..00000000000
--- a/spec/rubocop/cop/migration/add_column_with_default_to_large_table_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-require 'rubocop'
-require 'rubocop/rspec/support'
-
-require_relative '../../../../rubocop/cop/migration/add_column_with_default_to_large_table'
-
-describe RuboCop::Cop::Migration::AddColumnWithDefaultToLargeTable do
-  include CopHelper
-
-  subject(:cop) { described_class.new }
-
-  context 'in migration' do
-    before do
-      allow(cop).to receive(:in_migration?).and_return(true)
-    end
-
-    described_class::LARGE_TABLES.each do |table|
-      it "registers an offense for the #{table} table" do
-        inspect_source(cop, "add_column_with_default :#{table}, :column, default: true")
-
-        aggregate_failures do
-          expect(cop.offenses.size).to eq(1)
-          expect(cop.offenses.map(&:line)).to eq([1])
-        end
-      end
-    end
-
-    it 'registers no offense for non-blacklisted tables' do
-      inspect_source(cop, "add_column_with_default :table, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-
-  context 'outside of migration' do
-    it 'registers no offense' do
-      table = described_class::LARGE_TABLES.sample
-      inspect_source(cop, "add_column_with_default :#{table}, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-end
diff --git a/spec/rubocop/cop/migration/update_large_table_spec.rb b/spec/rubocop/cop/migration/update_large_table_spec.rb
new file mode 100644
index 00000000000..17b19e139e4
--- /dev/null
+++ b/spec/rubocop/cop/migration/update_large_table_spec.rb
@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+require 'rubocop'
+require 'rubocop/rspec/support'
+
+require_relative '../../../../rubocop/cop/migration/update_large_table'
+
+describe RuboCop::Cop::Migration::UpdateLargeTable do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  context 'in migration' do
+    before do
+      allow(cop).to receive(:in_migration?).and_return(true)
+    end
+
+    shared_examples 'large tables' do |update_method|
+      described_class::LARGE_TABLES.each do |table|
+        it "registers an offense for the #{table} table" do
+          inspect_source(cop, "#{update_method} :#{table}, :column, default: true")
+
+          aggregate_failures do
+            expect(cop.offenses.size).to eq(1)
+            expect(cop.offenses.map(&:line)).to eq([1])
+          end
+        end
+      end
+    end
+
+    context 'for the add_column_with_default method' do
+      include_examples 'large tables', 'add_column_with_default'
+    end
+
+    context 'for the update_column_in_batches method' do
+      include_examples 'large tables', 'update_column_in_batches'
+    end
+
+    it 'registers no offense for non-blacklisted tables' do
+      inspect_source(cop, "add_column_with_default :table, :column, default: true")
+
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers no offense for non-blacklisted methods' do
+      table = described_class::LARGE_TABLES.sample
+
+      inspect_source(cop, "some_other_method :#{table}, :column, default: true")
+
+      expect(cop.offenses).to be_empty
+    end
+  end
+
+  context 'outside of migration' do
+    let(:table) { described_class::LARGE_TABLES.sample }
+
+    it 'registers no offense for add_column_with_default' do
+      inspect_source(cop, "add_column_with_default :#{table}, :column, default: true")
+
+      expect(cop.offenses).to be_empty
+    end
+
+    it 'registers no offense for update_column_in_batches' do
+      inspect_source(cop, "add_column_with_default :#{table}, :column, default: true")
+
+      expect(cop.offenses).to be_empty
+    end
+  end
+end