From 5c6395d8b1a8c7cf540dae9fdd37f3e68554215c Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sun, 4 Nov 2012 16:24:35 +0100
Subject: fixing tests, including support files from all engines

---
 users/test/integration/api/account_flow_test.rb | 2 +-
 users/test/support/auth_test_helper.rb          | 4 ++++
 users/test/test_helper.rb                       | 4 ----
 users/test/unit/user_test.rb                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'users')

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
 
-- 
cgit v1.2.3


From cf1e7ee20f713068cadf5cfa78840115e0a8a081 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sun, 4 Nov 2012 16:28:58 +0100
Subject: using ruby-srp 0.1.4 - ruby 1.9.3 compatible

---
 users/app/assets/javascripts/srp | 2 +-
 users/leap_web_users.gemspec     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
index 23350b5..d6a7804 160000
--- a/users/app/assets/javascripts/srp
+++ b/users/app/assets/javascripts/srp
@@ -1 +1 @@
-Subproject commit 23350b54ec2723e1b2e333626567c9fe9d1e2644
+Subproject commit d6a78049f3356d9d645143362eca74434410bf62
diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
index 6d35f63..dec5a71 100644
--- a/users/leap_web_users.gemspec
+++ b/users/leap_web_users.gemspec
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "leap_web_core", LeapWeb::VERSION
 
-  s.add_dependency "ruby-srp", "~> 0.1.3"
+  s.add_dependency "ruby-srp", "~> 0.1.4"
 end
-- 
cgit v1.2.3