Use sshfs in preference to nfs for vagrant file sharing

[rails.git] / test / controllers / swf_controller_test.rb

diff --git a/test/controllers/swf_controller_test.rb b/test/controllers/swf_controller_test.rb
index e293bc41b2185b34dc7314d641eba65db1827647..2b8a19beb077a0823b660d616d3adc8a9a05789e 100644 (file)
--- a/test/controllers/swf_controller_test.rb
+++ b/test/controllers/swf_controller_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class SwfControllerTest < ActionController::TestCase
 require "test_helper"
 
 class SwfControllerTest < ActionController::TestCase

-  api_fixtures
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -25,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
 
       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_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
 
     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_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
 
     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_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
     assert_equal 74, response.body.length
   end
 end