Merge pull request #20 from vinted/fix/rails_7_1_changes

Adjust checks to changes in rails 7.1
vinted · Sep 11, 2024 · d58b028 · d58b028
2 parents 65716f5 + 5d33de5
commit d58b028
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pronto-rails_migrations (0.14.4)
+    pronto-rails_migrations (0.15.0)
       faraday (>= 1.10.3)
       multipart-post (>= 2.1.1)
       pronto (>= 0.11.1)

diff --git a/lib/pronto/rails_migrations.rb b/lib/pronto/rails_migrations.rb
@@ -37,12 +37,12 @@ def bad_structure_sql_messages
 
       structure_sql = File.read(patch.new_file_full_path)
       inserts = structure_sql.split("\n").grep(/\('\d+'\)/)
-      unordered_inserts = (inserts.sort != inserts)
+      unordered_inserts = (inserts.sort.reverse != inserts)
 
       *all_but_tail, tail = inserts
       bad_semicolons = all_but_tail.any? { |line| line.end_with?(';') } || !tail.end_with?(';')
 
-      bad_ending = structure_sql[-4, 4] !~ /[^\n]\n\n\n/
+      bad_ending = structure_sql[-2, 2] !~ /[^\n]\n/
 
       messages = []
 
@@ -59,7 +59,7 @@ def bad_structure_sql_messages
           'last insert must end with semicolon (`;`).'
         )
       end
-      messages << message(patch, '`db/structure.sql` must end with 2 empty lines.') if bad_ending
+      messages << message(patch, '`db/structure.sql` must end without extra empty lines.') if bad_ending
 
       messages
     end

diff --git a/lib/pronto/rails_migrations/version.rb b/lib/pronto/rails_migrations/version.rb
@@ -1,3 +1,3 @@
 module Pronto
-  RAILS_MIGRATIONS_VERSION = '0.14.4'
+  RAILS_MIGRATIONS_VERSION = '0.15.0'
 end