Move the fixtures out of the static folder.

This way we can ensure they’re not cached. This fixed a failing test in IE 6-7.

Author: savetheclocktower

test.new/static/fixtures/content.html renamed to test.new/fixtures/content.html

@@ -8,6 +8,8 @@ class UnitTests < Sinatra::Application
 
   PWD = Pathname.new( File.expand_path( File.dirname(__FILE__) ) )
 
+  UNIQUE_ASSET_STRING = Time.new.to_i
+
   set :root, PWD
   set :public_folder, PWD.join('static')
 
@@ -21,7 +23,8 @@ class UnitTests < Sinatra::Application
     raise "You must run `rake dist` before starting the server."
   end
 
-  PATH_TO_TEST_JS = PWD.join('tests')
+  PATH_TO_TEST_JS  = PWD.join('tests')
+  PATH_TO_FIXTURES = PWD.join('fixtures')
 
   SUITES = []
 
@@ -41,7 +44,12 @@ class UnitTests < Sinatra::Application
   end
 
   after do
-    headers('X-UA-Compatible' => 'IE=edge')
+    headers({
+      'X-UA-Compatible' => 'IE=edge',
+      'Cache-Control'   => 'no-cache, no-store, must-revalidate',
+      'Pragma'          => 'no-cache',
+      'Expires'         => '0'
+    })
   end
 
 
@@ -50,9 +58,14 @@ def self.get_or_post(url, &block)
     post(url, &block)
   end
 
+  get '/test' do
+    redirect to('/test/')
+  end
+
   get '/test/:names?' do
     names = params[:names]
     @suites = names.nil? ? SUITES : names.split(/,/).uniq
+    @unique_asset_string = UNIQUE_ASSET_STRING.to_s
     erb :tests, :locals => { :suites => @suites }
   end
 
@@ -61,6 +74,12 @@ def self.get_or_post(url, &block)
     send_file PATH_TO_PROTOTYPE
   end
 
+
+  # We don't put either of these in the /static directory because
+  # (a) they should be more prominent in the directory structure;
+  # (b) they should never, ever get cached, and we want to enforce that
+  #     aggressively.
+
   get '/js/tests/:filename' do
     filename = params[:filename]
     path = PATH_TO_TEST_JS.join(filename)
@@ -72,6 +91,11 @@ def self.get_or_post(url, &block)
     end
   end
 
+  get '/fixtures/:filename' do
+    filename = params[:filename]
+    send_file PATH_TO_FIXTURES.join(filename)
+  end
+
 
   # Routes for Ajax tests