summaryrefslogtreecommitdiff
path: root/users/test
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-05 09:58:44 -0800
committerjessib <jessib@riseup.net>2012-11-05 09:58:44 -0800
commit3515a598341282c20feb5950a81f43552280688d (patch)
tree74a2d250faeddc76b3b9955c1085282f9cc13956 /users/test
parentfb1c8e60335fefc55191eee16d83f53d2e9a2031 (diff)
parentcf1e7ee20f713068cadf5cfa78840115e0a8a081 (diff)
Merge branch 'develop' into help_develop
Diffstat (limited to 'users/test')
-rw-r--r--users/test/integration/api/account_flow_test.rb2
-rw-r--r--users/test/support/auth_test_helper.rb4
-rw-r--r--users/test/test_helper.rb4
-rw-r--r--users/test/unit/user_test.rb2
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