X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/124ec2e9d560e0df291e5a8e5aa67ef5db2f5d46..a3a10237f7cbd4586086133a926dc4dd9fd5b7bf:/test/controllers/swf_controller_test.rb diff --git a/test/controllers/swf_controller_test.rb b/test/controllers/swf_controller_test.rb index 953bf33ab..2b8a19beb 100644 --- a/test/controllers/swf_controller_test.rb +++ b/test/controllers/swf_controller_test.rb @@ -23,22 +23,22 @@ class SwfControllerTest < ActionController::TestCase create(:tracepoint, :trace => trace, :latitude => (51.512 * GeoRecord::SCALE).to_i, :longitude => (0.142 * GeoRecord::SCALE).to_i) end - get :trackpoints, :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1 + get :trackpoints, :params => { :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1 } assert_response :success assert_equal "application/x-shockwave-flash", response.content_type - assert_match /^FWS/, response.body + assert_match(/^FWS/, response.body) assert_equal 80, response.body.length - get :trackpoints, :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => other_user.tokens.create.token + get :trackpoints, :params => { :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => other_user.tokens.create.token } assert_response :success assert_equal "application/x-shockwave-flash", response.content_type - assert_match /^FWS/, response.body + assert_match(/^FWS/, response.body) assert_equal 67, response.body.length - get :trackpoints, :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => user.tokens.create.token + get :trackpoints, :params => { :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => user.tokens.create.token } assert_response :success assert_equal "application/x-shockwave-flash", response.content_type - assert_match /^FWS/, response.body + assert_match(/^FWS/, response.body) assert_equal 74, response.body.length end end