ridgepole 0.6.4 → 0.6.5.beta

data/spec/mysql/collation/collation_spec.rb

@@ -1,148 +1,144 @@
-unless postgresql?
-if mysql_awesome_enabled?
-  describe 'Ridgepole::Client#diff -> migrate' do
-    context 'when change column (add collation)' do
-      let(:actual_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false
-            t.text    "text",    limit: 65535, null: false
-          end
-        RUBY
-      }
-
-      let(:expected_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
-            t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
-          end
-        RUBY
-      }
-
-      before { subject.diff(actual_dsl).migrate }
-      subject { client }
-
-      it {
-        delta = subject.diff(expected_dsl)
-        expect(delta.differ?).to be_truthy
-        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-        delta.migrate
-        expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
-      }
-    end
-
-    context 'when change column (delete collation)' do
-      let(:actual_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
-            t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
-          end
-        RUBY
-      }
-
-      let(:expected_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false
-            t.text    "text",    limit: 65535, null: false
-          end
-        RUBY
-      }
-
-      before { subject.diff(actual_dsl).migrate }
-      subject { client }
-
-      it {
-        delta = subject.diff(expected_dsl)
-        expect(delta.differ?).to be_truthy
-        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-        delta.migrate
-        expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
-      }
-    end
-
-    context 'when change column (change collation)' do
-      let(:actual_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
-            t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
-          end
-        RUBY
-      }
+describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled] do
+  context 'when change column (add collation)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false
+          t.text    "text",    limit: 65535, null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
 
-      let(:expected_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false,                 collation: "utf8mb4_bin"
-            t.text    "text",    limit: 65535, null: false,                 collation: "ascii_bin"
-          end
-        RUBY
-      }
+  context 'when change column (delete collation)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false
+          t.text    "text",    limit: 65535, null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
 
-      before { subject.diff(actual_dsl).migrate }
-      subject { client }
+  context 'when change column (change collation)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false,                 collation: "utf8mb4_bin"
+          t.text    "text",    limit: 65535, null: false,                 collation: "ascii_bin"
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
 
+  context 'when change column (no change collation)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", unsigned: true, force: :cascade do |t|
+          t.integer "emp_no",  limit: 4,     null: false
+          t.integer "club_id", limit: 4,     null: false, unsigned: true
+          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(actual_dsl)
+      expect(delta.differ?).to be_falsey
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy actual_dsl
+    }
+
+    describe '#diff' do
       it {
-        delta = subject.diff(expected_dsl)
-        expect(delta.differ?).to be_truthy
-        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-        delta.migrate
-        expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
-      }
-    end
-
-    context 'when change column (no change collation)' do
-      let(:actual_dsl) {
-        <<-RUBY
-          create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-            t.integer "emp_no",  limit: 4,     null: false
-            t.integer "club_id", limit: 4,     null: false, unsigned: true
-            t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
-            t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
-          end
-        RUBY
-      }
+        Tempfile.open("#{File.basename __FILE__}.#{$$}") do |f|
+          f.puts(actual_dsl)
+          f.flush
 
-      before { subject.diff(actual_dsl).migrate }
-      subject { client }
+          out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, '--enable-mysql-awesome', '--dump-without-table-options')
 
-      it {
-        delta = subject.diff(actual_dsl)
-        expect(delta.differ?).to be_falsey
-        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-        delta.migrate
-        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+          expect(out).to be_empty
+          expect(status.success?).to be_truthy
+        end
       }
-
-      describe '#diff' do
-        it {
-          Tempfile.open("#{File.basename __FILE__}.#{$$}") do |f|
-            f.puts(actual_dsl)
-            f.flush
-
-            out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, '--enable-mysql-awesome', '--dump-without-table-options')
-
-            expect(out).to be_empty
-            expect(status.success?).to be_truthy
-          end
-        }
-      end
     end
   end
 end
-end

data/spec/mysql/diff/diff2_spec.rb

@@ -1,4 +1,3 @@
-unless postgresql?
 describe 'Ridgepole::Client.diff' do
   context 'when change column' do
     let(:tmpdir) { Dir.mktmpdir }
@@ -170,7 +169,7 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-RUBY
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
 
         change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
@@ -183,4 +182,3 @@ describe 'Ridgepole::Client.diff' do
     end
   end
 end
-end

data/spec/mysql/diff/diff_spec.rb

@@ -1,4 +1,3 @@
-unless postgresql?
 describe 'Ridgepole::Client.diff' do
   context 'when change column' do
     let(:actual_dsl) {
@@ -144,7 +143,7 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-RUBY
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
 
         change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
@@ -153,4 +152,3 @@ describe 'Ridgepole::Client.diff' do
     }
   end
 end
-end

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -1,4 +1,3 @@
-unless postgresql?
 describe 'Ridgepole::Client.dump' do
   context 'when there is a tables' do
     before { restore_tables }
@@ -7,7 +6,7 @@ describe 'Ridgepole::Client.dump' do
     let(:options) {
       opts = {}
 
-      if mysql_awesome_enabled?
+      if condition(:mysql_awesome_enabled)
         opts[:enable_mysql_awesome] = true
         opts[:dump_without_table_options] = true
       else
@@ -17,15 +16,35 @@ describe 'Ridgepole::Client.dump' do
       opts
     }
 
+    let(:template_variables) {
+      opts = {
+        clubs: {force: :cascade},
+        departments: {force: :cascade},
+        employee_clubs: {force: :cascade},
+        employees: {force: :cascade},
+        unsigned: {},
+      }
+
+      if condition(:mysql_awesome_enabled)
+        opts[:clubs].unshift(unsigned: true)
+        opts[:departments].unshift(id: :string, limit: 4)
+        opts[:employee_clubs].unshift(unsigned: true)
+        opts[:employees].unshift(id: :integer, limit: 4)
+        opts[:unsigned] = {unsigned: true}
+      end
+
+      opts
+    }
+
     it {
-      expect(subject.dump(conn_spec, options)).to eq <<-RUBY.strip_heredoc.strip
-        create_table "clubs",#{if_mysql_awesome_enabled(' unsigned: true,')} force: :cascade do |t|
+      expect(subject.dump(conn_spec, options)).to match_fuzzy erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= @clubs.i %> do |t|
           t.string "name", limit: 255, default: "", null: false
         end
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no",#{mysql_awesome_enabled? ? ' id: :string, limit: 4,' : ''} force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= @departments.i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -51,14 +70,14 @@ describe 'Ridgepole::Client.dump' do
         add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
         add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
 
-        create_table "employee_clubs",#{if_mysql_awesome_enabled(' unsigned: true,')} force: :cascade do |t|
-          t.integer "emp_no",  limit: 4, null: false#{unsigned_if_enabled}
-          t.integer "club_id", limit: 4, null: false#{unsigned_if_enabled}
+        create_table "employee_clubs", <%= @employee_clubs.i %> do |t|
+          t.integer "emp_no",  <%= {limit: 4, null: false}.push(@unsigned).i %>
+          t.integer "club_id", <%= {limit: 4, null: false}.push(@unsigned).i %>
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no",#{if_mysql_awesome_enabled(' id: :integer, limit: 4,')} force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= @employees.i %> do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -83,8 +102,7 @@ describe 'Ridgepole::Client.dump' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
   end
 end
-end

data/spec/mysql/dump/dump_some_tables_spec.rb

@@ -1,12 +1,23 @@
-unless postgresql?
 describe 'Ridgepole::Client#dump' do
+  let(:template_variables) {
+    opts = {
+      employees: {force: :cascade},
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:employees].unshift(id: :integer, limit: 4)
+    end
+
+    opts
+  }
+
   context 'when there is a tables (dump some tables)' do
     before { restore_tables }
     subject { client(tables: ['employees', 'salaries']) }
 
     it {
-      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
-        create_table "employees", primary_key: "emp_no",#{if_mysql_awesome_enabled(' id: :integer, limit: 4,')} force: :cascade do |t|
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
+        create_table "employees", primary_key: "emp_no", <%= @employees.i %> do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -22,7 +33,7 @@ describe 'Ridgepole::Client#dump' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
   end
 
@@ -40,8 +51,8 @@ describe 'Ridgepole::Client#dump' do
     }
 
     it {
-      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
-        create_table "employees", primary_key: "emp_no",#{if_mysql_awesome_enabled(' id: :integer, limit: 4,')} force: :cascade do |t|
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
+        create_table "employees", primary_key: "emp_no", <%= @employees.i %> do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -57,8 +68,7 @@ describe 'Ridgepole::Client#dump' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
   end
 end
-end

data/spec/mysql/dump/dump_spec.rb

@@ -1,18 +1,37 @@
-unless postgresql?
 describe 'Ridgepole::Client#dump' do
   context 'when there is a tables' do
     before { restore_tables }
     subject { client }
 
+    let(:template_variables) {
+      opts = {
+        clubs: {force: :cascade},
+        departments: {force: :cascade},
+        employee_clubs: {force: :cascade},
+        employees: {force: :cascade},
+        unsigned: {}
+      }
+
+      if condition(:mysql_awesome_enabled)
+        opts[:clubs].unshift(unsigned: true)
+        opts[:departments].unshift(id: :string, limit: 4)
+        opts[:employee_clubs].unshift(unsigned: true)
+        opts[:employees].unshift(id: :integer, limit: 4)
+        opts[:unsigned] = {unsigned: true}
+      end
+
+      opts
+    }
+
     it {
-      expect(subject.dump).to eq <<-RUBY.strip_heredoc.strip
-        create_table "clubs",#{if_mysql_awesome_enabled(' unsigned: true,')} force: :cascade do |t|
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= @clubs.i %> do |t|
           t.string "name", limit: 255, default: "", null: false
         end
 
         add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
 
-        create_table "departments", primary_key: "dept_no",#{mysql_awesome_enabled? ? ' id: :string, limit: 4,' : ''} force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= @departments.i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -38,14 +57,14 @@ describe 'Ridgepole::Client#dump' do
         add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
         add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
 
-        create_table "employee_clubs",#{if_mysql_awesome_enabled(' unsigned: true,')} force: :cascade do |t|
-          t.integer "emp_no",  limit: 4, null: false#{unsigned_if_enabled}
-          t.integer "club_id", limit: 4, null: false#{unsigned_if_enabled}
+        create_table "employee_clubs", <%= @employee_clubs.i %> do |t|
+          t.integer "emp_no",  <%= {limit: 4, null: false}.push(@unsigned).i %>
+          t.integer "club_id", <%= {limit: 4, null: false}.push(@unsigned).i %>
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
-        create_table "employees", primary_key: "emp_no",#{if_mysql_awesome_enabled(' id: :integer, limit: 4,')} force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= @employees.i %> do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -70,8 +89,7 @@ describe 'Ridgepole::Client#dump' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
   end
 end
-end

data/spec/mysql/dump/dump_without_table_options_spec.rb

@@ -1,45 +1,41 @@
-unless postgresql?
-if mysql_awesome_enabled?
-  describe 'Ridgepole::Client#dump' do
-    let(:actual_dsl) {
-      <<-'RUBY'
-        create_table "books", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
+describe 'Ridgepole::Client#dump', condition: [:mysql_awesome_enabled] do
+  let(:actual_dsl) {
+    <<-'EOS'
+      create_table "books", unsigned: true, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='\"london\" bridge \"is\" falling \"down\"'" do |t|
+        t.string   "title",      limit: 255, null: false
+        t.integer  "author_id",  limit: 4,   null: false
+        t.datetime "created_at"
+        t.datetime "updated_at"
+      end
+    EOS
+  }
+
+  context 'when without table options' do
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "books", unsigned: true, force: :cascade do |t|
           t.string   "title",      limit: 255, null: false
           t.integer  "author_id",  limit: 4,   null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
-      RUBY
+      EOS
     }
 
-    context 'when without table options' do
-      let(:expected_dsl) {
-        <<-RUBY
-          create_table "books", unsigned: true, force: :cascade do |t|
-            t.string   "title",      limit: 255, null: false
-            t.integer  "author_id",  limit: 4,   null: false
-            t.datetime "created_at"
-            t.datetime "updated_at"
-          end
-        RUBY
-      }
-
-      before { subject.diff(actual_dsl).migrate }
-      subject { client }
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
 
-      it {
-        expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
-      }
-    end
+    it {
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
 
-    context 'when with table options' do
-      before { subject.diff(actual_dsl).migrate }
-      subject { client(dump_without_table_options: false) }
+  context 'when with table options' do
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(dump_without_table_options: false) }
 
-      it {
-        expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
-      }
-    end
+    it {
+      expect(subject.dump).to match_fuzzy actual_dsl
+    }
   end
 end
-end

data/spec/mysql/fk/migrate_change_fk_spec.rb

@@ -1,4 +1,3 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
@@ -53,10 +52,9 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump.delete_empty_lines).to eq sorted_actual_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
       delta.migrate
-      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 end
-end