diff --git a/gemfiles/Gemfile.rails-5.0-beta b/gemfiles/Gemfile.rails-5.0-beta index c85bce0f..81a2cc1a 100644 --- a/gemfiles/Gemfile.rails-5.0-beta +++ b/gemfiles/Gemfile.rails-5.0-beta @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec path: '..' -gem 'rails', '5.0.0.beta1.1' +gem 'rails', '5.0.0.beta2' gem 'omniauth', '~>1.3.1' gem 'oauth2' gem 'omniauth-oauth2', '>= 1.2.0', '< 1.5.0' diff --git a/gemfiles/Gemfile.rails-5.0-beta.lock b/gemfiles/Gemfile.rails-5.0-beta.lock index 6f5ff4fe..f68710be 100644 --- a/gemfiles/Gemfile.rails-5.0-beta.lock +++ b/gemfiles/Gemfile.rails-5.0-beta.lock @@ -20,44 +20,39 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.beta1.1) - actionpack (= 5.0.0.beta1.1) - celluloid (~> 0.17.2) - coffee-rails (~> 4.1.0) - em-hiredis (~> 0.3.0) - faye-websocket (~> 0.10.0) - redis (~> 3.0) + actioncable (5.0.0.beta2) + actionpack (= 5.0.0.beta2) + nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.beta1.1) - actionpack (= 5.0.0.beta1.1) - actionview (= 5.0.0.beta1.1) - activejob (= 5.0.0.beta1.1) + actionmailer (5.0.0.beta2) + actionpack (= 5.0.0.beta2) + actionview (= 5.0.0.beta2) + activejob (= 5.0.0.beta2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.beta1.1) - actionview (= 5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) + actionpack (5.0.0.beta2) + actionview (= 5.0.0.beta2) + activesupport (= 5.0.0.beta2) rack (~> 2.x) rack-test (~> 0.6.3) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) + actionview (5.0.0.beta2) + activesupport (= 5.0.0.beta2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) + activejob (5.0.0.beta2) + activesupport (= 5.0.0.beta2) globalid (>= 0.3.6) - activemodel (5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) - builder (~> 3.1) - activerecord (5.0.0.beta1.1) - activemodel (= 5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) + activemodel (5.0.0.beta2) + activesupport (= 5.0.0.beta2) + activerecord (5.0.0.beta2) + activemodel (= 5.0.0.beta2) + activesupport (= 5.0.0.beta2) arel (~> 7.0) - activesupport (5.0.0.beta1.1) + activesupport (5.0.0.beta2) concurrent-ruby (~> 1.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -67,47 +62,13 @@ GEM arel (7.0.0) bcrypt (3.1.10) builder (3.2.2) - celluloid (0.17.3) - celluloid-essentials - celluloid-extras - celluloid-fsm - celluloid-pool - celluloid-supervision - timers (>= 4.1.1) - celluloid-essentials (0.20.5) - timers (>= 4.1.1) - celluloid-extras (0.20.5) - timers (>= 4.1.1) - celluloid-fsm (0.20.5) - timers (>= 4.1.1) - celluloid-pool (0.20.5) - timers (>= 4.1.1) - celluloid-supervision (0.20.5) - timers (>= 4.1.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) concurrent-ruby (1.0.0) - em-hiredis (0.3.0) - eventmachine (~> 1.0) - hiredis (~> 0.5.0) erubis (2.7.0) - eventmachine (1.0.9.1) - execjs (2.6.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - faye-websocket (0.10.2) - eventmachine (>= 0.12.0) - websocket-driver (>= 0.5.1) globalid (0.3.6) activesupport (>= 4.1.0) hashie (3.4.3) - hiredis (0.5.2) - hitimes (1.2.3) i18n (0.7.0) json (1.8.3) jwt (1.5.1) @@ -125,6 +86,7 @@ GEM multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) + nio4r (1.2.1) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) oauth2 (1.1.0) @@ -152,17 +114,17 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.beta1.1) - actioncable (= 5.0.0.beta1.1) - actionmailer (= 5.0.0.beta1.1) - actionpack (= 5.0.0.beta1.1) - actionview (= 5.0.0.beta1.1) - activejob (= 5.0.0.beta1.1) - activemodel (= 5.0.0.beta1.1) - activerecord (= 5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) + rails (5.0.0.beta2) + actioncable (= 5.0.0.beta2) + actionmailer (= 5.0.0.beta2) + actionpack (= 5.0.0.beta2) + actionview (= 5.0.0.beta2) + activejob (= 5.0.0.beta2) + activemodel (= 5.0.0.beta2) + activerecord (= 5.0.0.beta2) + activesupport (= 5.0.0.beta2) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.beta1.1) + railties (= 5.0.0.beta2) sprockets-rails (>= 2.0.0) rails-controller-testing (0.0.3) rails (>= 4.2) @@ -174,30 +136,27 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.0.beta1.1) - actionpack (= 5.0.0.beta1.1) - activesupport (= 5.0.0.beta1.1) + railties (5.0.0.beta2) + actionpack (= 5.0.0.beta2) + activesupport (= 5.0.0.beta2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) rdoc (4.2.1) - redis (3.2.2) responders (2.1.1) railties (>= 4.2.0, < 5.1) ruby-openid (2.7.0) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.0.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - timers (4.1.1) - hitimes tzinfo (1.2.2) thread_safe (~> 0.1) warden (1.2.6) @@ -225,7 +184,7 @@ DEPENDENCIES omniauth-facebook omniauth-oauth2 (>= 1.2.0, < 1.5.0) omniauth-openid (~> 1.0.1) - rails (= 5.0.0.beta1.1) + rails (= 5.0.0.beta2) rails-controller-testing rdoc responders (~> 2.1.1) diff --git a/test/test_helpers_test.rb b/test/test_helpers_test.rb index 31230e35..374c2dba 100644 --- a/test/test_helpers_test.rb +++ b/test/test_helpers_test.rb @@ -68,13 +68,13 @@ class TestHelpersTest < Devise::ControllerTestCase test "respects custom failure app" do custom_failure_app = Class.new(Devise::FailureApp) do def redirect - self.status = 306 + self.status = 300 end end swap Devise.warden_config, failure_app: custom_failure_app do get :index - assert_response 306 + assert_response 300 end end