Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

web/spec/spec_helper.rb

@@ -99,7 +99,7 @@ Spork.prefork do
     config.include Snapshot
 
     config.before(:suite) do
-      set_up_snapshot
+      #set_up_snapshot
     end
 
     config.before(:all) do
@@ -107,15 +107,10 @@ Spork.prefork do
     end
 
     config.before(:each) do
-
       if example.metadata[:js]
         page.driver.resize(1920, 1080)
         page.driver.headers = { 'User-Agent' => 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0' }
       end
-
-      if example.metadata[:snap]
-        snapshot_example
-      end
     end
 
     config.before(:each, :js => true) do
@@ -145,7 +140,7 @@ Spork.prefork do
     end
 
     config.after(:suite) do
-      tear_down_snapshot
+      #tear_down_snapshot
       wipe_s3_test_bucket
     end
   end