From e9ac34c44d2f88a236082f28f4e4c82a1dcfa494 Mon Sep 17 00:00:00 2001
From: Jordan Stephens <iam@jordanstephens.net>
Date: Fri, 2 Jan 2015 14:02:34 -0500
Subject: [PATCH 1/3] upgrade react-source to 0.12.2

---
 react-rails.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-rails.gemspec b/react-rails.gemspec
index a8b26bb05..43a1b95cb 100644
--- a/react-rails.gemspec
+++ b/react-rails.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'execjs'
   s.add_dependency 'rails', '>= 3.1'
-  s.add_dependency 'react-source', '0.12.1'
+  s.add_dependency 'react-source', '0.12.2'
 
   s.files = Dir[
     'lib/**/*',

From a80d91782a9c88838bb55a82e7cfc77ab8586fae Mon Sep 17 00:00:00 2001
From: Jordan Stephens <iam@jordanstephens.net>
Date: Fri, 2 Jan 2015 14:04:13 -0500
Subject: [PATCH 2/3] expect double-quoted displayName in transformed JSX after
 facebook/react@eddbb0c

---
 test/jsxtransform_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jsxtransform_test.rb b/test/jsxtransform_test.rb
index 33f7d75d1..8702f7c10 100644
--- a/test/jsxtransform_test.rb
+++ b/test/jsxtransform_test.rb
@@ -9,7 +9,7 @@
 (function() {
   var Component;
 
-  Component = React.createClass({displayName: 'Component',
+  Component = React.createClass({displayName: "Component",
     render: function() {
       return React.createElement(ExampleComponent, {videos:this.props.videos} );
     }

From 4adbe403340f5944474d995a04cc8376c50cfb61 Mon Sep 17 00:00:00 2001
From: Jordan Stephens <iam@jordanstephens.net>
Date: Mon, 5 Jan 2015 18:37:21 -0500
Subject: [PATCH 3/3] use full path in integration tests

looks like this is required after updating to actionpack 4.2.0

See change made in this commit:
https://github.com/rails/rails/commit/4fd144dd4bb0e1ede5a4857c178138088353a3d1?diff=unified#diff-82ecef623242ece0e7d717577485d988L303
---
 test/jsxtransform_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jsxtransform_test.rb b/test/jsxtransform_test.rb
index 8702f7c10..16b48a352 100644
--- a/test/jsxtransform_test.rb
+++ b/test/jsxtransform_test.rb
@@ -21,13 +21,13 @@
 class JSXTransformTest < ActionDispatch::IntegrationTest
 
   test 'asset pipeline should transform JSX' do
-    get 'assets/example.js'
+    get '/assets/example.js'
     assert_response :success
     assert_equal EXPECTED_JS, @response.body
   end
 
   test 'asset pipeline should transform JSX + Coffeescript' do
-    get 'assets/example2.js'
+    get '/assets/example2.js'
     assert_response :success
     # Different coffee-script may generate slightly different outputs,
     # as some version inserts an extra "\n" at the beginning.