Merge 39a16b7 into 22d1705

ridgepole · Jul 29, 2023 · 28fb5b2 · 28fb5b2
2 parents 22d1705 + 39a16b7
commit 28fb5b2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/ridgepole.gemspec b/ridgepole.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '1.51.0'
+  spec.add_development_dependency 'rubocop', '1.54.2'
   spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
   spec.add_development_dependency 'simplecov'

diff --git a/spec/mysql/default_lambda/default_lambda_spec.rb b/spec/mysql/default_lambda/default_lambda_spec.rb
@@ -84,18 +84,18 @@
     end
 
     it do
-      delta = subject.diff(<<-RUBY)
+      delta = subject.diff(erbh(<<-ERB))
         create_table "foos", force: :cascade do |t|
-          t.datetime "bar", default: -> { "CURRENT_TIMESTAMP" }, null: false
+          t.datetime "bar", default: -> { "CURRENT_TIMESTAMP<%= i cond('>= 7.0', '(6)') %>" }, null: false
         end
-      RUBY
+      ERB
 
       expect(delta.differ?).to be_truthy
       delta.migrate
 
       expect(subject.dump).to match_fuzzy erbh(<<-ERB)
         create_table "foos", force: :cascade do |t|
-          t.datetime "bar", <%= i cond(">= 7.0", { precision: nil }) %>, default: -> { "CURRENT_TIMESTAMP" }, null: false
+          t.datetime "bar", default: -> { "CURRENT_TIMESTAMP<%= i cond('>= 7.0', '(6)') %>" }, null: false
         end
       ERB
     end

diff --git a/spec/mysql/migrate/migrate_add_column2_spec.rb b/spec/mysql/migrate/migrate_add_column2_spec.rb
@@ -70,10 +70,10 @@
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_ruby actual_dsl.sub(/"emp_no"/, '"emp_no", limit: 3')
+      expect(subject.dump).to match_ruby actual_dsl.sub('"emp_no"', '"emp_no", limit: 3')
       migrated, sql = delta.migrate(noop: true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to match_ruby actual_dsl.sub(/"emp_no"/, '"emp_no", limit: 3')
+      expect(subject.dump).to match_ruby actual_dsl.sub('"emp_no"', '"emp_no", limit: 3')
 
       expect(sql).to match_fuzzy erbh('ALTER TABLE `dept_emp` ADD `emp_no2` mediumint NOT NULL AFTER `emp_no`')
     }
@@ -109,10 +109,10 @@
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_ruby actual_dsl.sub(/"emp_no"/, '"emp_no", limit: 3')
+      expect(subject.dump).to match_ruby actual_dsl.sub('"emp_no"', '"emp_no", limit: 3')
       migrated, sql = delta.migrate(noop: true)
       expect(migrated).to be_truthy
-      expect(subject.dump).to match_ruby actual_dsl.sub(/"emp_no"/, '"emp_no", limit: 3')
+      expect(subject.dump).to match_ruby actual_dsl.sub('"emp_no"', '"emp_no", limit: 3')
 
       expect(sql).to match_fuzzy erbh('ALTER TABLE `dept_emp` ADD `emp_no2` int NOT NULL AFTER `emp_no`')
     }

diff --git a/spec/mysql/migrate/migrate_skip_rename_table_spec.rb b/spec/mysql/migrate/migrate_skip_rename_table_spec.rb
@@ -135,7 +135,7 @@
       expect(delta.differ?).to be_falsey
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl.gsub(/, renamed_from: 'employees'/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(", renamed_from: 'employees'", '')
     }
   end
 end
diff --git a/spec/postgresql/migrate/migrate_rename_table_spec.rb b/spec/postgresql/migrate/migrate_rename_table_spec.rb
@@ -132,7 +132,7 @@
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_ruby expected_dsl.gsub(/, renamed_from: 'employees'/, '')
+      expect(subject.dump).to match_ruby expected_dsl.gsub(", renamed_from: 'employees'", '')
     }
   end