Skip to content

Commit

Permalink
More TravisCI config fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Seaver committed May 3, 2012
1 parent 9862a1c commit b5e4a88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -2,3 +2,6 @@ rvm:
- 1.8.7
- 1.9.2
- 1.9.3

before_script:
- psql -c 'create database postgres_ext_test;' -U postgres
4 changes: 2 additions & 2 deletions spec/dummy/config/database.yml
@@ -1,13 +1,13 @@
test:
adapter: postgresql
database: postgres_ext
database: postgres_ext_test
username: postgres
encoding: utf8
port: 5432
min_messages: warning
development:
adapter: postgresql
database: postgres_ext
database: postgres_ext_dev
username: postgres
encoding: utf8
port: 5432
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/initializers/wrap_parameters.rb
Expand Up @@ -5,7 +5,7 @@

# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
wrap_parameters format: [:json]
wrap_parameters :format => [:json]
end

# Disable root element in JSON by default.
Expand Down

0 comments on commit b5e4a88

Please sign in to comment.