Merge pull request #112 from tricknotes/ruby-22

Test against Ruby 2.2 on Travis CI

Author: zpao

.travis.yml

@@ -1,6 +1,7 @@
 ---
 language: ruby
 rvm:
+  - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3

react-rails.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'turbolinks', '>= 2.0.0'
   s.add_development_dependency 'es5-shim-rails', '>= 2.0.5'
   s.add_development_dependency 'poltergeist', '>= 0.3.3'
+  s.add_development_dependency 'test-unit', '~> 2.5'
 
   s.add_development_dependency 'jbuilder'
 

test/server_rendered_html_test.rb

@@ -19,14 +19,14 @@ def wait_to_ensure_asset_pipeline_detects_changes
 
     begin
       get '/server/1'
-      refute_match 'Updated', response.body
+      refute_match /Updated/, response.body
 
       wait_to_ensure_asset_pipeline_detects_changes
       FileUtils.cp file_with_updates, app_file
       FileUtils.touch app_file
 
       get '/server/1'
-      assert_match 'Updated', response.body
+      assert_match /Updated/, response.body
     ensure
       # if we have a test failure, we want to make sure that we revert the dummy file
       wait_to_ensure_asset_pipeline_detects_changes