ridgepole 0.6.4 → 0.6.5.beta

data/spec/mysql/migrate/migrate_same_spec.rb

@@ -1,15 +1,30 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
+  let(:template_variables) {
+    opts = {
+      unsigned: {},
+      string_id: {},
+      int_id: {},
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:unsigned] = {unsigned: true}
+      opts[:string_id] = {id: :string, limit: 4}
+      opts[:int_id] = {id: :integer, limit: 4}
+    end
+
+    opts
+  }
+
   context 'when database and definition are same' do
     let(:dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).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", <%= {force: :cascade}.unshift(@string_id).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -35,14 +50,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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"#{unsigned_if_enabled}, 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", <%= {force: :cascade}.unshift(@unsigned).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",#{mysql_awesome_enabled? ? ' id: :integer, limit: 4,' : ''} force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@int_id).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
@@ -67,7 +82,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { restore_tables }
@@ -76,10 +91,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy dsl
       delta.migrate
-      expect(subject.dump).to eq dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy dsl
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_script_error_spec.rb

@@ -1,9 +1,8 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when there is an error in the script' do
     let(:actual_dsl) { '' }
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
         end
@@ -68,7 +67,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -76,7 +75,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
 
       errmsg = Regexp.new(Regexp.escape <<-EOS.strip)
         33: add_index("employee_clubs", ["emp_no", "Xclub_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
@@ -88,4 +87,3 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_skip_rename_column_spec.rb

@@ -1,15 +1,26 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
+  let(:template_variables) {
+    opts = {
+      unsigned: {}
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:unsigned] = {unsigned: true}
+    end
+
+    opts
+  }
+
   context 'when rename column' do
     let(:actual_dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).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"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -35,14 +46,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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"#{unsigned_if_enabled}, 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", <%= {force: :cascade}.unshift(@unsigned).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"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).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
@@ -67,18 +78,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).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"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -104,14 +115,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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"#{unsigned_if_enabled}, 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", <%= {force: :cascade}.unshift(@unsigned).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"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).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
@@ -136,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -145,9 +156,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/\s*,\s*renamed_from:.*$/, '')
+      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/\s*,\s*renamed_from:.*$/, '')
     }
 
     it {
@@ -156,4 +167,3 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_skip_rename_table_spec.rb

@@ -1,15 +1,26 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
+  let(:template_variables) {
+    opts = {
+      unsigned: {}
+    }
+
+    if condition(:mysql_awesome_enabled)
+      opts[:unsigned] = {unsigned: true}
+    end
+
+    opts
+  }
+
   context 'when rename table' do
     let(:actual_dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).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"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -35,14 +46,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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"#{unsigned_if_enabled}, 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", <%= {force: :cascade}.unshift(@unsigned).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 "employees2", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "employees2", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).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
@@ -67,18 +78,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
-        create_table "clubs"#{unsigned_if_enabled}, force: :cascade do |t|
+      erbh(<<-EOS, template_variables)
+        create_table "clubs", <%= {force: :cascade}.unshift(@unsigned).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"#{unsigned_if_enabled}, force: :cascade do |t|
+        create_table "departments", primary_key: "dept_no", <%= {force: :cascade}.unshift(@unsigned).i %> do |t|
           t.string "dept_name", limit: 40, null: false
         end
 
@@ -104,14 +115,14 @@ describe 'Ridgepole::Client#diff -> migrate' 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"#{unsigned_if_enabled}, 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", <%= {force: :cascade}.unshift(@unsigned).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 "employees2", primary_key: "emp_no"#{unsigned_if_enabled}, force: :cascade, renamed_from: 'employees' do |t|
+        create_table "employees2", primary_key: "emp_no", <%= {force: :cascade}.unshift(@unsigned).i %>, renamed_from: 'employees' do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name",  limit: 16, null: false
@@ -136,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "titles", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -145,9 +156,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip.gsub(/, renamed_from: 'employees'/, '')
+      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: 'employees'/, '')
     }
 
     it {
@@ -156,4 +167,3 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 end
-end

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

@@ -1,8 +1,7 @@
-unless postgresql?
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when with ignore tables option (same)' do
     let(:current_schema) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -19,11 +18,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -40,11 +39,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -52,7 +51,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(current_schema).migrate }
@@ -61,15 +60,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy expected_dsl
       delta.migrate
-      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 
   context 'when with ignore tables option (differ)' do
     let(:current_schema) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -86,11 +85,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
@@ -107,11 +106,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:before_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -119,11 +118,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     let(:after_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
@@ -131,7 +130,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(current_schema).migrate }
@@ -140,23 +139,23 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq before_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy before_dsl
       delta.migrate
-      expect(subject.dump).to eq after_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy after_dsl
     }
 
     it {
       delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
-      RUBY
+      EOS
     }
   end
 
   context 'when with ignore tables option (target and ignore)' do
     let(:current_schema) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -173,11 +172,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
@@ -194,11 +193,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:before_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -206,11 +205,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     let(:after_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
@@ -218,7 +217,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(current_schema).migrate }
@@ -227,23 +226,23 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq before_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy before_dsl
       delta.migrate
-      expect(subject.dump).to eq after_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy after_dsl
     }
 
     it {
       delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
-      RUBY
+      EOS
     }
   end
 
   context 'when with ignore tables option (target)' do
     let(:current_schema) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -260,11 +259,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["salary"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
@@ -281,11 +280,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
-      RUBY
+      EOS
     }
 
     let(:before_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 14, null: false
@@ -293,11 +292,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     let(:after_dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
           t.date   "birth_date",            null: false
           t.string "first_name", limit: 15, null: false
@@ -305,7 +304,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender",     limit: 1,  null: false
           t.date   "hire_date",             null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(current_schema).migrate }
@@ -314,18 +313,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to eq before_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy before_dsl
       delta.migrate
-      expect(subject.dump).to eq after_dsl.strip_heredoc.strip
+      expect(subject.dump).to match_fuzzy after_dsl
     }
 
     it {
       delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+      expect(delta.script).to match_fuzzy <<-EOS
         change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
-      RUBY
+      EOS
     }
   end
 end
-end