Merge pull request #90 from Shopify/gem-updates

Fix build and deprecation warnings

Rakefile

@@ -3,6 +3,8 @@ require 'bundler'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
+ENV['TEASPOON_RAILS_ENV'] = File.expand_path("../test/example/config/environment", __FILE__)
+
 APP_RAKEFILE = File.expand_path("../test/example/Rakefile", __FILE__)
 load "rails/tasks/engine.rake"
 

test/example/config/application.rb

@@ -4,7 +4,7 @@
 require "turbograft"
 require "jquery-rails"
 require 'rails/all'
-require 'teaspoon'
+require 'teaspoon-mocha'
 require 'byebug'
 require 'pry'
 require 'pry-byebug'

test/example/config/environments/test.rb

@@ -1,14 +1,16 @@
 Example::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.active_support.test_order = :random
+
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil

turbograft.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "selenium-webdriver"
-  spec.add_development_dependency "teaspoon"
+  spec.add_development_dependency "teaspoon-mocha"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "thin"
   spec.add_development_dependency "byebug"