cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update bundle

Browse source
This commit is contained in:
Tom Hughes 2016-01-19 00:10:31 +00:00
parent cb43e6af9e
commit 2ef6a960d1
3 changed files with 42 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Gemfile.lock
View file

@ -41,15 +41,14 @@ GEM
tzinfo (~> 1.1)
addressable (2.4.0)
arel (6.0.3)
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
autoprefixer-rails (6.1.2)
ast (2.2.0)
autoprefixer-rails (6.3.1)
execjs
json
bigdecimal (1.1.0)
builder (3.2.2)
capybara (2.5.0)
capybara (2.6.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@ -60,15 +59,15 @@ GEM
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.1.0)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorize (0.7.7)
composite_primary_keys (8.1.1)
composite_primary_keys (8.1.2)
activerecord (~> 4.2.0)
concurrent-ruby (1.0.0)
coveralls (0.8.10)
@ -79,7 +78,7 @@ GEM
thor (~> 0.19.1)
tins (~> 1.6.0)
crass (1.0.2)
dalli (2.7.4)
dalli (2.7.5)
deadlock_retry (1.2.0)
docile (1.1.5)
domain_name (0.5.25)
@ -87,7 +86,7 @@ GEM
dynamic_form (1.1.4)
erubis (2.7.0)
execjs (2.6.0)
exifr (1.2.3.1)
exifr (1.2.4)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
fspath (2.1.1)
@ -98,10 +97,10 @@ GEM
http-cookie (1.0.2)
domain_name (~> 0.5)
http_accept_language (2.0.5)
httpclient (2.7.0.1)
httpclient (2.7.1)
i18n (0.7.0)
i18n-js (3.0.0.rc11)
i18n (~> 0.6)
i18n-js (3.0.0.rc12)
i18n (~> 0.6, >= 0.6.6)
image_optim (0.22.0)
exifr (~> 1.2, >= 1.2.2)
fspath (~> 2.1)
@ -110,7 +109,7 @@ GEM
progress (~> 3.0, >= 3.0.1)
image_size (1.4.1)
in_threads (1.3.1)
jquery-rails (4.0.5)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@ -153,9 +152,9 @@ GEM
multi_xml (0.5.5)
multipart-post (2.0.0)
netrc (0.11.0)
nokogiri (1.6.7)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
nokogumbo (1.4.1)
nokogumbo (1.4.7)
nokogiri
oauth (0.4.7)
oauth-plugin (0.5.1)
@ -169,18 +168,18 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
omniauth (1.2.2)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (~> 1.0)
rack (>= 1.0, < 3)
omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.2.10)
omniauth-google-oauth2 (0.3.0)
addressable (~> 2.3)
jwt (~> 1.0)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (~> 1.3.1)
omniauth-oauth2 (1.3.1)
omniauth-oauth2 (>= 1.3.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-openid (1.0.1)
@ -195,8 +194,8 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
parser (2.2.3.0)
ast (>= 1.1, < 3.0)
parser (2.3.0.1)
ast (~> 2.2)
pg (0.18.4)
poltergeist (1.8.1)
capybara (~> 2.1)
@ -204,8 +203,8 @@ GEM
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
powerpack (0.1.1)
progress (3.1.0)
psych (2.0.15)
progress (3.1.1)
psych (2.0.17)
r2 (0.2.6)
rack (1.6.4)
rack-cors (0.4.0)
@ -234,7 +233,7 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails-i18n (4.0.7)
rails-i18n (4.0.8)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.5)
@ -243,29 +242,27 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.4.2)
redcarpet (3.3.3)
rake (10.5.0)
redcarpet (3.3.4)
ref (2.0.0)
request_store (1.2.1)
request_store (1.3.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rinku (1.7.3)
rubocop (0.35.1)
astrolabe (~> 1.3)
parser (>= 2.2.3.0, < 3.0)
rubocop (0.36.0)
parser (>= 2.3.0.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
tins (<= 1.6.0)
ruby-openid (2.7.0)
ruby-progressbar (1.7.5)
sanitize (4.0.0)
sanitize (4.0.1)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (= 1.4.1)
sass (3.4.19)
nokogumbo (~> 1.4.1)
sass (3.4.21)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
@ -278,7 +275,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
soap4r-ruby1.9 (2.0.5)
sprockets (3.5.1)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
@ -292,7 +289,7 @@ GEM
ref
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
tilt (2.0.2)
timecop (0.8.0)
tins (1.6.0)
tzinfo (1.2.2)

6
test/integration/user_creation_test.rb
View file

@ -511,7 +511,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to "/user/terms"
@ -542,7 +542,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new")
@ -572,7 +572,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to "/user/terms"

8
test/integration/user_login_test.rb
View file

@ -1070,7 +1070,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -1090,7 +1090,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
@ -1114,7 +1114,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
@ -1138,7 +1138,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive")
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
follow_redirect!
assert_response :redirect
follow_redirect!