From d007956865e622b7d10e26e32a4f036535aae8df Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Mon, 6 Mar 2017 17:28:06 +0000 Subject: [PATCH] Use user factory for swf_controller tests. --- test/controllers/swf_controller_test.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/controllers/swf_controller_test.rb b/test/controllers/swf_controller_test.rb index 13322c6b5..e293bc41b 100644 --- a/test/controllers/swf_controller_test.rb +++ b/test/controllers/swf_controller_test.rb @@ -15,7 +15,9 @@ class SwfControllerTest < ActionController::TestCase ## # basic test that trackpoints at least returns some sort of flash movie def test_trackpoints - create(:trace, :visibility => "trackable", :latitude => 51.51, :longitude => -0.14, :user => users(:public_user)) do |trace| + user = create(:user) + other_user = create(:user) + create(:trace, :visibility => "trackable", :latitude => 51.51, :longitude => -0.14, :user => user) do |trace| create(:tracepoint, :trace => trace, :trackid => 1, :latitude => (51.510 * GeoRecord::SCALE).to_i, :longitude => (-0.140 * GeoRecord::SCALE).to_i) create(:tracepoint, :trace => trace, :trackid => 2, :latitude => (51.511 * GeoRecord::SCALE).to_i, :longitude => (-0.141 * GeoRecord::SCALE).to_i) end @@ -29,13 +31,13 @@ class SwfControllerTest < ActionController::TestCase 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 => users(:normal_user).tokens.create.token + get :trackpoints, :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_equal 67, response.body.length - get :trackpoints, :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => users(:public_user).tokens.create.token + get :trackpoints, :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 -- 2.43.2