diff --git a/test/misc/attribute_params_test.rb b/test/misc/attribute_params_test.rb index 41915fce5e..3091e0ed7f 100644 --- a/test/misc/attribute_params_test.rb +++ b/test/misc/attribute_params_test.rb @@ -427,9 +427,8 @@ def update_record_from_params(record, action, *columns, &block) end def build_action_columns(record, action, *columns) - config = @controller.active_scaffold_config_for record.class - config.send(action).columns = columns - config.send(action).columns + config = @controller.active_scaffold_config_for(record.class) + config.build_action_columns(action, columns) end end diff --git a/test/mock_app/.gitignore b/test/mock_app/.gitignore index bd6dd4ade8..02a0abca72 100644 --- a/test/mock_app/.gitignore +++ b/test/mock_app/.gitignore @@ -1,2 +1,3 @@ tmp/ -log/ \ No newline at end of file +log/ +db/*.sqlite3 diff --git a/test/mock_app/config.ru b/test/mock_app/config.ru index 143ac784ae..7e681f07ce 100644 --- a/test/mock_app/config.ru +++ b/test/mock_app/config.ru @@ -1,4 +1,4 @@ # This file is used by Rack-based servers to start the application. require ::File.expand_path('../config/environment', __FILE__) -run TestApp::Application +run RailsApp::Application diff --git a/test/mock_app/config/database.yml b/test/mock_app/config/database.yml index d9a169e1cc..88ec4a73bf 100644 --- a/test/mock_app/config/database.yml +++ b/test/mock_app/config/database.yml @@ -2,7 +2,7 @@ # gem install sqlite3-ruby (not necessary on OS X Leopard) development: adapter: sqlite3 - database: ":memory:" + database: db/test.sqlite3 pool: 5 timeout: 5000 diff --git a/test/mock_app/db/test.sqlite3 b/test/mock_app/db/test.sqlite3 deleted file mode 100644 index 1db515f9a1..0000000000 --- a/test/mock_app/db/test.sqlite3 +++ /dev/null @@ -1 +0,0 @@ -S \ No newline at end of file