diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | config/config.yml.example | 2 | ||||
| -rw-r--r-- | test/dummy/app/controllers/application_controller.rb | 5 | ||||
| -rw-r--r-- | test/test_helper.rb | 3 | ||||
| m--------- | users/app/assets/javascripts/srp | 0 | ||||
| -rw-r--r-- | users/leap_web_users.gemspec | 2 | ||||
| -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 |
12 files changed, 29 insertions, 12 deletions
@@ -12,4 +12,5 @@ gem 'leap_web_certs', :path => 'certs' gem 'leap_web_help', :path => 'help' # To use debugger -gem 'ruby-debug' +gem 'debugger', :platforms => :mri_19 +gem 'ruby-debug', :platforms => :mri_18 diff --git a/Gemfile.lock b/Gemfile.lock index 86cb8e8..be3cebb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH specs: leap_web_users (0.1.0) leap_web_core (= 0.1.0) - ruby-srp (~> 0.1.3) + ruby-srp (~> 0.1.4) GEM remote: https://rubygems.org/ @@ -81,6 +81,13 @@ GEM couchrest_session_store (0.0.1) couchrest couchrest_model + debugger (1.2.1) + columnize (>= 0.3.1) + debugger-linecache (~> 1.1.1) + debugger-ruby_core_source (~> 1.1.4) + debugger-linecache (1.1.2) + debugger-ruby_core_source (>= 1.1.1) + debugger-ruby_core_source (1.1.4) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -143,7 +150,7 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) - ruby-srp (0.1.3) + ruby-srp (0.1.4) sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) @@ -174,6 +181,7 @@ PLATFORMS DEPENDENCIES bootstrap-sass (~> 2.1.0) coffee-rails (~> 3.2.2) + debugger haml (~> 3.1.7) haml-rails (~> 0.3.4) jquery-rails @@ -29,7 +29,7 @@ Typically, this application is installed automatically as part of the LEAP Platf ### Install system requirements sudo apt-get install git ruby1.8 rubygems1.8 couchdb - sudo gem bundler + sudo gem install bundler On Debian Wheezy or later, there is a Debian package for bundler, so you can alternately run ``sudo apt-get install bundler``. diff --git a/config/config.yml.example b/config/config.yml.example index e3a0112..c34dd10 100644 --- a/config/config.yml.example +++ b/config/config.yml.example @@ -4,5 +4,5 @@ development: test: admins: [admin, admin2] -production +production: admins: [] diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb new file mode 100644 index 0000000..be7aa1f --- /dev/null +++ b/test/dummy/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + protect_from_forgery + + ActiveSupport.run_load_hooks(:application_controller, self) +end diff --git a/test/test_helper.rb b/test/test_helper.rb index f7d48ec..50d5159 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,6 +4,9 @@ require 'rails/test_help' require 'mocha' +# Load support files from all engines +Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f } + class ActiveSupport::TestCase # Add more helper methods to be used by all tests here... end diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp -Subproject 23350b54ec2723e1b2e333626567c9fe9d1e264 +Subproject d6a78049f3356d9d645143362eca74434410bf6 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 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 |