diff options
author | Azul <azul@leap.se> | 2012-11-04 16:24:35 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-11-04 16:24:35 +0100 |
commit | 5c6395d8b1a8c7cf540dae9fdd37f3e68554215c (patch) | |
tree | 727cd51d00addfb26ebbfc9a75d890513b709930 /users | |
parent | 2264623a445bf5c64404ef302f63e4d99ecbd97f (diff) |
fixing tests, including support files from all engines
Diffstat (limited to 'users')
-rw-r--r-- | users/test/integration/api/account_flow_test.rb | 2 | ||||
-rw-r--r-- | users/test/support/auth_test_helper.rb | 4 | ||||
-rw-r--r-- | users/test/test_helper.rb | 4 | ||||
-rw-r--r-- | users/test/unit/user_test.rb | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb index 66de1e5..5800d46 100644 --- a/users/test/integration/api/account_flow_test.rb +++ b/users/test/integration/api/account_flow_test.rb @@ -39,7 +39,7 @@ class AccountFlowTest < ActionDispatch::IntegrationTest end test "signup response" do - assert_json_response @user_params.slice(:login, :password_salt) + assert_json_response :login => @login, :ok => true assert_response :success end diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb index d5d52b1..9412058 100644 --- a/users/test/support/auth_test_helper.rb +++ b/users/test/support/auth_test_helper.rb @@ -23,3 +23,7 @@ module AuthTestHelper end end end + +class ActionController::TestCase + include AuthTestHelper +end diff --git a/users/test/test_helper.rb b/users/test/test_helper.rb index ae6a35c..e8f0125 100644 --- a/users/test/test_helper.rb +++ b/users/test/test_helper.rb @@ -7,7 +7,3 @@ Rails.backtrace_cleaner.remove_silencers! # Load support files Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } - -class ActionController::TestCase - include AuthTestHelper -end diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb index 822ef33..f057ca7 100644 --- a/users/test/unit/user_test.rb +++ b/users/test/unit/user_test.rb @@ -19,7 +19,7 @@ class UserTest < ActiveSupport::TestCase end test "test require alphanumerical for login" do - @user.login = "qwär" + @user.login = "qw#r" assert !@user.valid? end |