From c1ebff35de4261055bf6ae77837e5c13fa1627a3 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Jun 2017 11:35:36 +0900
Subject: [PATCH 1/4] Use nokogiri 1.6.x on Ruby 2.0

`nokogiri` 1.7 requires Ruby version >= 2.1.0. Therefore, lock the version.
---
 gemfiles/Gemfile-rails-4-2              | 1 +
 gemfiles/Gemfile-sass-3-1               | 1 +
 gemfiles/Gemfile-sass-3-2               | 1 +
 gemfiles/Gemfile-sass-3-3               | 1 +
 gemfiles/Gemfile-sass-3-4               | 1 +
 gemfiles/Gemfile-sprockets-2-11         | 1 +
 gemfiles/Gemfile-sprockets-2-12         | 1 +
 gemfiles/Gemfile-sprockets-2-8          | 1 +
 gemfiles/Gemfile-sprockets-3-0          | 1 +
 gemfiles/Gemfile-sprockets-4-0          | 1 +
 gemfiles/Gemfile-sprockets-rails-2-2    | 1 +
 gemfiles/Gemfile-sprockets-rails-master | 1 +
 12 files changed, 12 insertions(+)

diff --git a/gemfiles/Gemfile-rails-4-2 b/gemfiles/Gemfile-rails-4-2
index d12f9a4..08ed377 100644
--- a/gemfiles/Gemfile-rails-4-2
+++ b/gemfiles/Gemfile-rails-4-2
@@ -7,3 +7,4 @@ gem "rails", "~> 4.2.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-1 b/gemfiles/Gemfile-sass-3-1
index 7adb13b..14a734b 100644
--- a/gemfiles/Gemfile-sass-3-1
+++ b/gemfiles/Gemfile-sass-3-1
@@ -7,3 +7,4 @@ gem "rails"
 gem "sass", "~> 3.1.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-2 b/gemfiles/Gemfile-sass-3-2
index 3aaae9e..706cd4e 100644
--- a/gemfiles/Gemfile-sass-3-2
+++ b/gemfiles/Gemfile-sass-3-2
@@ -7,3 +7,4 @@ gem "rails"
 gem "sass", "~> 3.2.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-3 b/gemfiles/Gemfile-sass-3-3
index 92f3fb6..95f3a51 100644
--- a/gemfiles/Gemfile-sass-3-3
+++ b/gemfiles/Gemfile-sass-3-3
@@ -7,3 +7,4 @@ gem "rails"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-4 b/gemfiles/Gemfile-sass-3-4
index e564171..8a46884 100644
--- a/gemfiles/Gemfile-sass-3-4
+++ b/gemfiles/Gemfile-sass-3-4
@@ -7,3 +7,4 @@ gem "rails"
 gem "sass", "~> 3.4.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-2-11 b/gemfiles/Gemfile-sprockets-2-11
index 98e3a4c..79eda74 100644
--- a/gemfiles/Gemfile-sprockets-2-11
+++ b/gemfiles/Gemfile-sprockets-2-11
@@ -8,3 +8,4 @@ gem "sprockets", "~> 2.11.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-2-12 b/gemfiles/Gemfile-sprockets-2-12
index 51126ae..0e0ad94 100644
--- a/gemfiles/Gemfile-sprockets-2-12
+++ b/gemfiles/Gemfile-sprockets-2-12
@@ -8,3 +8,4 @@ gem "sprockets", "~> 2.12.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-2-8 b/gemfiles/Gemfile-sprockets-2-8
index 2d7eb51..947440d 100644
--- a/gemfiles/Gemfile-sprockets-2-8
+++ b/gemfiles/Gemfile-sprockets-2-8
@@ -8,3 +8,4 @@ gem "sprockets", "~> 2.8.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-3-0 b/gemfiles/Gemfile-sprockets-3-0
index b875023..2bc6258 100644
--- a/gemfiles/Gemfile-sprockets-3-0
+++ b/gemfiles/Gemfile-sprockets-3-0
@@ -8,3 +8,4 @@ gem "sprockets", "~> 3.0.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-4-0 b/gemfiles/Gemfile-sprockets-4-0
index 0d8841c..da6d9cb 100644
--- a/gemfiles/Gemfile-sprockets-4-0
+++ b/gemfiles/Gemfile-sprockets-4-0
@@ -7,3 +7,4 @@ gem "rails"
 gem "sprockets", "~> 4.x"
 gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9')
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-rails-2-2 b/gemfiles/Gemfile-sprockets-rails-2-2
index f40ba3f..c4ea2dd 100644
--- a/gemfiles/Gemfile-sprockets-rails-2-2
+++ b/gemfiles/Gemfile-sprockets-rails-2-2
@@ -8,3 +8,4 @@ gem "sprockets-rails", "~> 2.2.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-rails-master b/gemfiles/Gemfile-sprockets-rails-master
index dd169bd..d0ca96d 100644
--- a/gemfiles/Gemfile-sprockets-rails-master
+++ b/gemfiles/Gemfile-sprockets-rails-master
@@ -8,3 +8,4 @@ gem "sprockets-rails", github: "rails/sprockets-rails"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")

From fe62a75255dee6a776a48f7d30a66f9d9bff1281 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Jun 2017 12:44:18 +0900
Subject: [PATCH 2/4] Use Rails 4.2 below Ruby 2.1

---
 gemfiles/Gemfile-sass-3-1               | 6 +++++-
 gemfiles/Gemfile-sass-3-2               | 6 +++++-
 gemfiles/Gemfile-sass-3-3               | 6 +++++-
 gemfiles/Gemfile-sass-3-4               | 6 +++++-
 gemfiles/Gemfile-sprockets-2-11         | 6 +++++-
 gemfiles/Gemfile-sprockets-2-12         | 6 +++++-
 gemfiles/Gemfile-sprockets-2-8          | 6 +++++-
 gemfiles/Gemfile-sprockets-3-0          | 6 +++++-
 gemfiles/Gemfile-sprockets-4-0          | 6 +++++-
 gemfiles/Gemfile-sprockets-rails-2-2    | 6 +++++-
 gemfiles/Gemfile-sprockets-rails-master | 6 +++++-
 11 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/gemfiles/Gemfile-sass-3-1 b/gemfiles/Gemfile-sass-3-1
index 14a734b..3a55240 100644
--- a/gemfiles/Gemfile-sass-3-1
+++ b/gemfiles/Gemfile-sass-3-1
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sass", "~> 3.1.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sass-3-2 b/gemfiles/Gemfile-sass-3-2
index 706cd4e..d1cef32 100644
--- a/gemfiles/Gemfile-sass-3-2
+++ b/gemfiles/Gemfile-sass-3-2
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sass", "~> 3.2.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sass-3-3 b/gemfiles/Gemfile-sass-3-3
index 95f3a51..2e74153 100644
--- a/gemfiles/Gemfile-sass-3-3
+++ b/gemfiles/Gemfile-sass-3-3
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sass-3-4 b/gemfiles/Gemfile-sass-3-4
index 8a46884..edf0fb1 100644
--- a/gemfiles/Gemfile-sass-3-4
+++ b/gemfiles/Gemfile-sass-3-4
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sass", "~> 3.4.0"
 gem "mime-types", "< 2"
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sprockets-2-11 b/gemfiles/Gemfile-sprockets-2-11
index 79eda74..10bbe61 100644
--- a/gemfiles/Gemfile-sprockets-2-11
+++ b/gemfiles/Gemfile-sprockets-2-11
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets", "~> 2.11.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
diff --git a/gemfiles/Gemfile-sprockets-2-12 b/gemfiles/Gemfile-sprockets-2-12
index 0e0ad94..21ef12c 100644
--- a/gemfiles/Gemfile-sprockets-2-12
+++ b/gemfiles/Gemfile-sprockets-2-12
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets", "~> 2.12.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
diff --git a/gemfiles/Gemfile-sprockets-2-8 b/gemfiles/Gemfile-sprockets-2-8
index 947440d..3d592bc 100644
--- a/gemfiles/Gemfile-sprockets-2-8
+++ b/gemfiles/Gemfile-sprockets-2-8
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets", "~> 2.8.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
diff --git a/gemfiles/Gemfile-sprockets-3-0 b/gemfiles/Gemfile-sprockets-3-0
index 2bc6258..873705e 100644
--- a/gemfiles/Gemfile-sprockets-3-0
+++ b/gemfiles/Gemfile-sprockets-3-0
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets", "~> 3.0.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
diff --git a/gemfiles/Gemfile-sprockets-4-0 b/gemfiles/Gemfile-sprockets-4-0
index da6d9cb..308eb9c 100644
--- a/gemfiles/Gemfile-sprockets-4-0
+++ b/gemfiles/Gemfile-sprockets-4-0
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets", "~> 4.x"
 gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9')
 gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sprockets-rails-2-2 b/gemfiles/Gemfile-sprockets-rails-2-2
index c4ea2dd..b619ab1 100644
--- a/gemfiles/Gemfile-sprockets-rails-2-2
+++ b/gemfiles/Gemfile-sprockets-rails-2-2
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets-rails", "~> 2.2.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
diff --git a/gemfiles/Gemfile-sprockets-rails-master b/gemfiles/Gemfile-sprockets-rails-master
index d0ca96d..aac4fec 100644
--- a/gemfiles/Gemfile-sprockets-rails-master
+++ b/gemfiles/Gemfile-sprockets-rails-master
@@ -3,7 +3,11 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-gem "rails"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
+  gem "rails", "~> 4.2.0"
+else
+  gem "rails"
+end
 gem "sprockets-rails", github: "rails/sprockets-rails"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"

From 12624d2b32b1ffbd2a426a39fe18f2ac8979281d Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Jun 2017 19:21:47 +0900
Subject: [PATCH 3/4] Add manifest files

---
 test/fixtures/engine_project/app/assets/config/manifest.js     | 3 +++
 .../engine_project/test/dummy/app/assets/config/manifest.js    | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 test/fixtures/engine_project/app/assets/config/manifest.js
 create mode 100644 test/fixtures/engine_project/test/dummy/app/assets/config/manifest.js

diff --git a/test/fixtures/engine_project/app/assets/config/manifest.js b/test/fixtures/engine_project/app/assets/config/manifest.js
new file mode 100644
index 0000000..b16e53d
--- /dev/null
+++ b/test/fixtures/engine_project/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
diff --git a/test/fixtures/engine_project/test/dummy/app/assets/config/manifest.js b/test/fixtures/engine_project/test/dummy/app/assets/config/manifest.js
new file mode 100644
index 0000000..b16e53d
--- /dev/null
+++ b/test/fixtures/engine_project/test/dummy/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

From 516609d35c2cca72822909c92de782ab45053860 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Jun 2017 19:24:07 +0900
Subject: [PATCH 4/4] Remove unused session_store initializer

---
 .../test/dummy/config/initializers/session_store.rb            | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb

diff --git a/test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb b/test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb
deleted file mode 100644
index bd9ae82..0000000
--- a/test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Dummy::Application.config.session_store :encrypted_cookie_store, key: '_dummy_session'