Merge pull request #486 from fkmy/fix-typos

Fix trivial typos
ridgepole · May 10, 2024 · 5e2c5a1 · 5e2c5a1
2 parents 272ecdb + a3fc80d
commit 5e2c5a1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,7 +45,7 @@
 
 - Updated supported column types [pull#399](https://github.com/ridgepole/ridgepole/pull/399) [pull#400](https://github.com/ridgepole/ridgepole/pull/400)
 - Support check constraint [pull#393](https://github.com/ridgepole/ridgepole/pull/393) [pull#397](https://github.com/ridgepole/ridgepole/pull/397)
-- Drop suport Rails 5.x [pull#395](https://github.com/ridgepole/ridgepole/pull/395)
+- Drop support Rails 5.x [pull#395](https://github.com/ridgepole/ridgepole/pull/395)
 
 ## 1.1
 

diff --git a/spec/mysql/migrate/migrate_change_check_constraint_spec.rb b/spec/mysql/migrate/migrate_change_check_constraint_spec.rb
@@ -64,7 +64,7 @@
     end
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(marge: true) }
+    subject { client(merge: true) }
 
     it {
       delta = subject.diff(expected_dsl)

diff --git a/spec/mysql/migrate/migrate_change_column_default_spec.rb b/spec/mysql/migrate/migrate_change_column_default_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when default:0 -> (emply)' do
+  context 'when default:0 -> (empty)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|
@@ -47,7 +47,7 @@
     }
   end
 
-  context 'when default:0 -> (emply with null:false)' do
+  context 'when default:0 -> (employ with null:false)' do
     let(:actual_dsl) do
       erbh(<<-ERB)
         create_table "salaries", id: false, force: :cascade do |t|

diff --git a/spec/mysql/migrate/migrate_merge_mode_spec.rb b/spec/mysql/migrate/migrate_merge_mode_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when marge table' do
+  context 'when merge table' do
     let(:actual_dsl) do
       erbh(<<-ERB)
         create_table "clubs", force: :cascade do |t|

diff --git a/spec/mysql/migrate/migrate_primary_key_spec.rb b/spec/mysql/migrate/migrate_primary_key_spec.rb
@@ -77,7 +77,7 @@
     }
   end
 
-  context 'when deafult: nil' do
+  context 'when default: nil' do
     let(:allow_pk_change) { true }
 
     let(:actual_dsl) do