diff options
author | Emilio Tagua <miloops@gmail.com> | 2010-05-27 10:07:51 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2010-05-27 10:07:51 -0300 |
commit | a158a736c821703682fc89bb83d7990e4618b08c (patch) | |
tree | 832aa0281b0eaa932eda77f6e6da0be194db97ae /spec/support | |
parent | 43bfd3fae496a2a859aad0a654a91437357c3450 (diff) | |
parent | 2ee391231842eec5ce75517c0b24576c1e2a3261 (diff) | |
download | rails-a158a736c821703682fc89bb83d7990e4618b08c.tar.gz rails-a158a736c821703682fc89bb83d7990e4618b08c.tar.bz2 rails-a158a736c821703682fc89bb83d7990e4618b08c.zip |
Merge branch 'master' of github.com:brynary/arel
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/check.rb | 2 | ||||
-rw-r--r-- | spec/support/connections/mysql_connection.rb | 2 | ||||
-rw-r--r-- | spec/support/connections/oracle_connection.rb | 2 | ||||
-rw-r--r-- | spec/support/connections/postgresql_connection.rb | 2 | ||||
-rw-r--r-- | spec/support/guards.rb | 2 | ||||
-rw-r--r-- | spec/support/matchers.rb | 2 | ||||
-rw-r--r-- | spec/support/matchers/have_rows.rb | 2 | ||||
-rw-r--r-- | spec/support/model.rb | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/spec/support/check.rb b/spec/support/check.rb index 0a89349629..c9adce420c 100644 --- a/spec/support/check.rb +++ b/spec/support/check.rb @@ -3,4 +3,4 @@ module Check # See: https://rspec.lighthouseapp.com/projects/5645/tickets/504 def check(*args) end -end
\ No newline at end of file +end diff --git a/spec/support/connections/mysql_connection.rb b/spec/support/connections/mysql_connection.rb index de9d05c2ce..c924c27080 100644 --- a/spec/support/connections/mysql_connection.rb +++ b/spec/support/connections/mysql_connection.rb @@ -11,4 +11,4 @@ ActiveRecord::Base.configurations = { :encoding => 'utf8', :database => 'arel_unit', } -}
\ No newline at end of file +} diff --git a/spec/support/connections/oracle_connection.rb b/spec/support/connections/oracle_connection.rb index c28602b134..309d127071 100644 --- a/spec/support/connections/oracle_connection.rb +++ b/spec/support/connections/oracle_connection.rb @@ -14,4 +14,4 @@ ActiveRecord::Base.configurations = { :password => 'arel_unit', :database => 'orcl', } -}
\ No newline at end of file +} diff --git a/spec/support/connections/postgresql_connection.rb b/spec/support/connections/postgresql_connection.rb index 34d304efa9..692533d10d 100644 --- a/spec/support/connections/postgresql_connection.rb +++ b/spec/support/connections/postgresql_connection.rb @@ -10,4 +10,4 @@ ActiveRecord::Base.configurations = { :encoding => 'utf8', :database => 'arel_unit', } -}
\ No newline at end of file +} diff --git a/spec/support/guards.rb b/spec/support/guards.rb index cfa4b7b79a..db6075f73a 100644 --- a/spec/support/guards.rb +++ b/spec/support/guards.rb @@ -25,4 +25,4 @@ module AdapterGuards def valid_adapters %w[mysql postgresql sqlite3 oracle] end -end
\ No newline at end of file +end diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb index 8cef5d947e..5f51a68633 100644 --- a/spec/support/matchers.rb +++ b/spec/support/matchers.rb @@ -1,4 +1,4 @@ require "support/matchers/be_like" require "support/matchers/disambiguate_attributes" require "support/matchers/hash_the_same_as" -require "support/matchers/have_rows"
\ No newline at end of file +require "support/matchers/have_rows" diff --git a/spec/support/matchers/have_rows.rb b/spec/support/matchers/have_rows.rb index 7d9c6a20c9..e476d25f4f 100644 --- a/spec/support/matchers/have_rows.rb +++ b/spec/support/matchers/have_rows.rb @@ -15,4 +15,4 @@ module Matchers found.compact.length == expected.length && got.compact.length == expected.length end end -end
\ No newline at end of file +end diff --git a/spec/support/model.rb b/spec/support/model.rb index be692e53ec..d5be35cbba 100644 --- a/spec/support/model.rb +++ b/spec/support/model.rb @@ -59,4 +59,4 @@ module Arel insert.record end end -end
\ No newline at end of file +end |