aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-21 05:30:25 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-21 05:30:25 -0700
commitb1b9de3d967eef113246666c28a403f3fb75ea68 (patch)
tree579f06b9deabd1230c4f6bff33223ec727639d3c
parent70d0537d5550958d7e006787de869ce9046101fc (diff)
parent5b673f3d46f6951258e84353f9b3684ce1e331d4 (diff)
downloadrails-b1b9de3d967eef113246666c28a403f3fb75ea68.tar.gz
rails-b1b9de3d967eef113246666c28a403f3fb75ea68.tar.bz2
rails-b1b9de3d967eef113246666c28a403f3fb75ea68.zip
Merge pull request #9847 from vipulnsward/fix_sqlite_test
Fix copy table index test; Change == to ! on false in travis.rb
-rw-r--r--activerecord/test/cases/adapters/sqlite3/copy_table_test.rb2
-rwxr-xr-xci/travis.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
index 21fb111c91..a5a22bc30b 100644
--- a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
@@ -90,7 +90,7 @@ protected
end
def table_indexes_without_name(table)
- @connection.indexes('comments_with_index').delete(:name)
+ @connection.indexes(table).delete(:name)
end
def row_count(table)
diff --git a/ci/travis.rb b/ci/travis.rb
index b03ac4fe35..9029c3f41c 100755
--- a/ci/travis.rb
+++ b/ci/travis.rb
@@ -109,7 +109,7 @@ end
# puts " #{`uname -a`}"
# puts " #{`ruby -v`}"
# puts " #{`mysql --version`}"
-# # puts " #{`pg_config --version`}"
+# puts " #{`pg_config --version`}"
# puts " SQLite3: #{`sqlite3 -version`}"
# `gem env`.each_line {|line| print " #{line}"}
# puts " Bundled gems:"
@@ -117,7 +117,7 @@ end
# puts " Local gems:"
# `gem list`.each_line {|line| print " #{line}"}
-failures = results.select { |key, value| value == false }
+failures = results.select { |key, value| !value }
if failures.empty?
puts