Fix dummy Rails 5 for test

fixlr · Jul 1, 2016 · a63934e · a63934e
1 parent 85f1297
commit a63934e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 48 deletions.
diff --git a/codemirror-rails.gemspec b/codemirror-rails.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_runtime_dependency 'railties', '>= 3.0', '< 5.1'
+  s.add_runtime_dependency 'railties', '>= 3.0', '< 6.0'
 
   s.add_development_dependency 'rails'
   s.add_development_dependency 'sqlite3'

diff --git a/test/dummy-5.0.x/bin/rails b/test/dummy-5.0.x/bin/rails
@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/test/dummy-5.0.x/bin/rake b/test/dummy-5.0.x/bin/rake
@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
diff --git a/test/dummy-5.0.x/bin/setup b/test/dummy-5.0.x/bin/setup
diff --git a/test/dummy-5.0.x/config.ru b/test/dummy-5.0.x/config.ru
@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application
diff --git a/test/dummy-5.0.x/config/application.rb b/test/dummy-5.0.x/config/application.rb
@@ -5,6 +5,7 @@
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
+require "codemirror-rails"
 
 module Dummy
   class Application < Rails::Application

diff --git a/test/dummy-5.0.x/config/boot.rb b/test/dummy-5.0.x/config/boot.rb
@@ -1,3 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/test/dummy-5.0.x/config/environments/development.rb b/test/dummy-5.0.x/config/environments/development.rb
@@ -50,5 +50,5 @@
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end