forked from openstreetmap/openstreetmap-website
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix some tests for changes in rails 5
- Loading branch information
Showing
6 changed files
with
20 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,22 @@ | ||
require "test_helper" | ||
|
||
class CORSTest < ActionDispatch::IntegrationTest | ||
# Rails 4 adds a built-in `options` method. When we upgrade, we can remove | ||
# this definition. | ||
unless instance_methods.include?(:options) | ||
def options(*args) | ||
reset! unless integration_session | ||
@html_document = nil | ||
integration_session.send(:process, :options, *args).tap do | ||
copy_session_variables! | ||
end | ||
end | ||
end | ||
|
||
def test_api_routes_allow_cross_origin_requests | ||
options "/api/capabilities", nil, | ||
"HTTP_ORIGIN" => "http://www.example.com", | ||
"HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET" | ||
process :options, "/api/capabilities", :headers => { | ||
"HTTP_ORIGIN" => "http://www.example.com", | ||
"HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET" | ||
} | ||
|
||
assert_response :success | ||
assert_equal "http://www.example.com", response.headers["Access-Control-Allow-Origin"] | ||
end | ||
|
||
def test_non_api_routes_dont_allow_cross_origin_requests | ||
assert_raises ActionController::RoutingError do | ||
options "/", nil, | ||
"HTTP_ORIGIN" => "http://www.example.com", | ||
"HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET" | ||
process :options, "/", :headers => { | ||
"HTTP_ORIGIN" => "http://www.example.com", | ||
"HTTP_ACCESS_CONTROL_REQUEST_METHOD" => "GET" | ||
} | ||
end | ||
end | ||
end |