Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/rubocop/cop/migration/schema_addition_methods_no_post_spec.rb b/spec/rubocop/cop/migration/schema_addition_methods_no_post_spec.rb
index 94c0638cf1b..92e714d7a02 100644
--- a/spec/rubocop/cop/migration/schema_addition_methods_no_post_spec.rb
+++ b/spec/rubocop/cop/migration/schema_addition_methods_no_post_spec.rb
@@ -42,5 +42,13 @@ RSpec.describe RuboCop::Cop::Migration::SchemaAdditionMethodsNoPost, feature_cat
         end
       CODE
     end
+
+    it "allows forbidden method to be called within nested statement" do
+      expect_no_offenses(<<~CODE)
+        def down
+          add_column(:table, :column, :boolean) unless column_exists?(:table, :column)
+        end
+      CODE
+    end
   end
 end