diff --git a/.gitignore b/.gitignore index 4408a678..b0bd5012 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /InstalledFiles /pkg/ /spec/reports/ -/spec/test_app/db/*.sqlite3 -/spec/test_app/log/* -/spec/test_app/tmp/* +/spec/test_apps/*/db/*.sqlite3 +/spec/test_apps/*/log/* +/spec/test_apps/*/tmp/* /tmp/ ## Documentation cache and generated files: @@ -25,3 +25,5 @@ node_modules npm-debug.log + +gemfiles/*.gemfile.lock diff --git a/Appraisals b/Appraisals new file mode 100644 index 00000000..d93840b8 --- /dev/null +++ b/Appraisals @@ -0,0 +1,6 @@ +%w[ + 4.2.10 +].each do |rails_version| + ENV['APPRAISAL_RAILS_VERSION'] = rails_version + appraise("rails-#{rails_version}") { gem 'rails', rails_version } +end diff --git a/Rakefile b/Rakefile index 59bb9421..f79c2637 100644 --- a/Rakefile +++ b/Rakefile @@ -1,26 +1,18 @@ -begin - require 'bundler/setup' -rescue LoadError - puts 'You must `gem install bundler` and `bundle install` to run rake tasks' -end +require 'bundler/gem_tasks' +require 'rspec/core/rake_task' -require 'rdoc/task' +RSpec::Core::RakeTask.new(:spec) -RDoc::Task.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'Guide' - rdoc.options << '--line-numbers' - rdoc.rdoc_files.include('README.rdoc') - rdoc.rdoc_files.include('lib/**/*.rb') +task :setup_test_app, [:rails_version] do |_task, args| + require_relative './spec/test_apps/setup' + TestApps::Setup.call args.fetch(:rails_version) { + abort "Example usage: rake #{ARGV[0]}[5.1.4]" + } end -APP_RAKEFILE = File.expand_path("../spec/test_app/Rakefile", __FILE__) -load 'rails/tasks/engine.rake' - - -load 'rails/tasks/statistics.rake' - - - -Bundler::GemHelper.install_tasks - +if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS'] + task default: :spec +else + require 'appraisal' + task default: :appraisal +end diff --git a/gemfiles/rails_4.2.10.gemfile b/gemfiles/rails_4.2.10.gemfile new file mode 100644 index 00000000..737829ee --- /dev/null +++ b/gemfiles/rails_4.2.10.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "4.2.10" + +gemspec path: "../" diff --git a/guide.gemspec b/guide.gemspec index b7c3285e..a85208ba 100644 --- a/guide.gemspec +++ b/guide.gemspec @@ -17,6 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 3.1", "< 5" s.add_dependency "sass-rails", ">= 3.2" + s.add_development_dependency "appraisal" s.add_development_dependency "sqlite3" s.add_development_dependency "rspec-rails" s.add_development_dependency "pry" diff --git a/scripts/buildkite_build.sh b/scripts/buildkite_build.sh index bb791c97..08877c00 100755 --- a/scripts/buildkite_build.sh +++ b/scripts/buildkite_build.sh @@ -3,4 +3,5 @@ set -ex bundle install --path vendor/bundle --retry 3 -bundle exec rspec spec +bundle exec appraisal install +bundle exec appraisal rspec spec diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index a6ea7fa0..8def7a88 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,6 +1,9 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' ENV['RAILS_ENV'] ||= 'test' -require File.expand_path("../../spec/test_app/config/environment", __FILE__) + +rails_version = ENV.fetch('APPRAISAL_RAILS_VERSION', '4.2.10') +require File.expand_path("../../spec/test_apps/rails-#{rails_version}/config/environment", __FILE__) + # Prevent database truncation if the environment is production abort("The Rails environment is running in production mode!") if Rails.env.production? require 'spec_helper' diff --git a/spec/test_app/README.rdoc b/spec/test_apps/rails-4.2.10/README.rdoc similarity index 100% rename from spec/test_app/README.rdoc rename to spec/test_apps/rails-4.2.10/README.rdoc diff --git a/spec/test_app/Rakefile b/spec/test_apps/rails-4.2.10/Rakefile similarity index 100% rename from spec/test_app/Rakefile rename to spec/test_apps/rails-4.2.10/Rakefile diff --git a/spec/test_apps/rails-4.2.10/app b/spec/test_apps/rails-4.2.10/app new file mode 120000 index 00000000..abbdfa63 --- /dev/null +++ b/spec/test_apps/rails-4.2.10/app @@ -0,0 +1 @@ +../shared/app \ No newline at end of file diff --git a/spec/test_app/bin/bundle b/spec/test_apps/rails-4.2.10/bin/bundle similarity index 100% rename from spec/test_app/bin/bundle rename to spec/test_apps/rails-4.2.10/bin/bundle diff --git a/spec/test_app/bin/rails b/spec/test_apps/rails-4.2.10/bin/rails similarity index 100% rename from spec/test_app/bin/rails rename to spec/test_apps/rails-4.2.10/bin/rails diff --git a/spec/test_app/bin/rake b/spec/test_apps/rails-4.2.10/bin/rake similarity index 100% rename from spec/test_app/bin/rake rename to spec/test_apps/rails-4.2.10/bin/rake diff --git a/spec/test_app/bin/setup b/spec/test_apps/rails-4.2.10/bin/setup similarity index 100% rename from spec/test_app/bin/setup rename to spec/test_apps/rails-4.2.10/bin/setup diff --git a/spec/test_app/config.ru b/spec/test_apps/rails-4.2.10/config.ru similarity index 100% rename from spec/test_app/config.ru rename to spec/test_apps/rails-4.2.10/config.ru diff --git a/spec/test_app/config/application.rb b/spec/test_apps/rails-4.2.10/config/application.rb similarity index 92% rename from spec/test_app/config/application.rb rename to spec/test_apps/rails-4.2.10/config/application.rb index 5c273b84..e3fecd44 100644 --- a/spec/test_app/config/application.rb +++ b/spec/test_apps/rails-4.2.10/config/application.rb @@ -24,7 +24,6 @@ class Application < Rails::Application # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - config.i18n.load_path += Dir[Rails.root.join('../../config', 'locales', '**', '*.{rb,yml}')] # Do not swallow errors in after_commit/after_rollback callbacks. config.active_record.raise_in_transactional_callbacks = true diff --git a/spec/test_app/config/boot.rb b/spec/test_apps/rails-4.2.10/config/boot.rb similarity index 100% rename from spec/test_app/config/boot.rb rename to spec/test_apps/rails-4.2.10/config/boot.rb diff --git a/spec/test_apps/rails-4.2.10/config/database.yml b/spec/test_apps/rails-4.2.10/config/database.yml new file mode 120000 index 00000000..d7951148 --- /dev/null +++ b/spec/test_apps/rails-4.2.10/config/database.yml @@ -0,0 +1 @@ +../../shared/config/database.yml \ No newline at end of file diff --git a/spec/test_app/config/environment.rb b/spec/test_apps/rails-4.2.10/config/environment.rb similarity index 100% rename from spec/test_app/config/environment.rb rename to spec/test_apps/rails-4.2.10/config/environment.rb diff --git a/spec/test_app/config/environments/development.rb b/spec/test_apps/rails-4.2.10/config/environments/development.rb similarity index 100% rename from spec/test_app/config/environments/development.rb rename to spec/test_apps/rails-4.2.10/config/environments/development.rb diff --git a/spec/test_app/config/environments/production.rb b/spec/test_apps/rails-4.2.10/config/environments/production.rb similarity index 100% rename from spec/test_app/config/environments/production.rb rename to spec/test_apps/rails-4.2.10/config/environments/production.rb diff --git a/spec/test_app/config/environments/test.rb b/spec/test_apps/rails-4.2.10/config/environments/test.rb similarity index 100% rename from spec/test_app/config/environments/test.rb rename to spec/test_apps/rails-4.2.10/config/environments/test.rb diff --git a/spec/test_app/config/initializers/assets.rb b/spec/test_apps/rails-4.2.10/config/initializers/assets.rb similarity index 100% rename from spec/test_app/config/initializers/assets.rb rename to spec/test_apps/rails-4.2.10/config/initializers/assets.rb diff --git a/spec/test_app/config/initializers/backtrace_silencers.rb b/spec/test_apps/rails-4.2.10/config/initializers/backtrace_silencers.rb similarity index 100% rename from spec/test_app/config/initializers/backtrace_silencers.rb rename to spec/test_apps/rails-4.2.10/config/initializers/backtrace_silencers.rb diff --git a/spec/test_app/config/initializers/cookies_serializer.rb b/spec/test_apps/rails-4.2.10/config/initializers/cookies_serializer.rb similarity index 100% rename from spec/test_app/config/initializers/cookies_serializer.rb rename to spec/test_apps/rails-4.2.10/config/initializers/cookies_serializer.rb diff --git a/spec/test_app/config/initializers/filter_parameter_logging.rb b/spec/test_apps/rails-4.2.10/config/initializers/filter_parameter_logging.rb similarity index 100% rename from spec/test_app/config/initializers/filter_parameter_logging.rb rename to spec/test_apps/rails-4.2.10/config/initializers/filter_parameter_logging.rb diff --git a/spec/test_app/config/initializers/guide.rb b/spec/test_apps/rails-4.2.10/config/initializers/guide.rb similarity index 100% rename from spec/test_app/config/initializers/guide.rb rename to spec/test_apps/rails-4.2.10/config/initializers/guide.rb diff --git a/spec/test_apps/rails-4.2.10/config/initializers/i18n.rb b/spec/test_apps/rails-4.2.10/config/initializers/i18n.rb new file mode 120000 index 00000000..1b1c7259 --- /dev/null +++ b/spec/test_apps/rails-4.2.10/config/initializers/i18n.rb @@ -0,0 +1 @@ +../../../shared/config/initializers/i18n.rb \ No newline at end of file diff --git a/spec/test_app/config/initializers/inflections.rb b/spec/test_apps/rails-4.2.10/config/initializers/inflections.rb similarity index 100% rename from spec/test_app/config/initializers/inflections.rb rename to spec/test_apps/rails-4.2.10/config/initializers/inflections.rb diff --git a/spec/test_app/config/initializers/mime_types.rb b/spec/test_apps/rails-4.2.10/config/initializers/mime_types.rb similarity index 100% rename from spec/test_app/config/initializers/mime_types.rb rename to spec/test_apps/rails-4.2.10/config/initializers/mime_types.rb diff --git a/spec/test_app/config/initializers/session_store.rb b/spec/test_apps/rails-4.2.10/config/initializers/session_store.rb similarity index 100% rename from spec/test_app/config/initializers/session_store.rb rename to spec/test_apps/rails-4.2.10/config/initializers/session_store.rb diff --git a/spec/test_app/config/initializers/wrap_parameters.rb b/spec/test_apps/rails-4.2.10/config/initializers/wrap_parameters.rb similarity index 100% rename from spec/test_app/config/initializers/wrap_parameters.rb rename to spec/test_apps/rails-4.2.10/config/initializers/wrap_parameters.rb diff --git a/spec/test_app/config/locales/en.yml b/spec/test_apps/rails-4.2.10/config/locales/en.yml similarity index 100% rename from spec/test_app/config/locales/en.yml rename to spec/test_apps/rails-4.2.10/config/locales/en.yml diff --git a/spec/test_app/config/routes.rb b/spec/test_apps/rails-4.2.10/config/routes.rb similarity index 100% rename from spec/test_app/config/routes.rb rename to spec/test_apps/rails-4.2.10/config/routes.rb diff --git a/spec/test_app/config/secrets.yml b/spec/test_apps/rails-4.2.10/config/secrets.yml similarity index 100% rename from spec/test_app/config/secrets.yml rename to spec/test_apps/rails-4.2.10/config/secrets.yml diff --git a/spec/test_app/db/schema.rb b/spec/test_apps/rails-4.2.10/db/schema.rb similarity index 100% rename from spec/test_app/db/schema.rb rename to spec/test_apps/rails-4.2.10/db/schema.rb diff --git a/spec/test_app/app/assets/images/.keep b/spec/test_apps/rails-4.2.10/lib/assets/.keep similarity index 100% rename from spec/test_app/app/assets/images/.keep rename to spec/test_apps/rails-4.2.10/lib/assets/.keep diff --git a/spec/test_app/app/controllers/concerns/.keep b/spec/test_apps/rails-4.2.10/log/.keep similarity index 100% rename from spec/test_app/app/controllers/concerns/.keep rename to spec/test_apps/rails-4.2.10/log/.keep diff --git a/spec/test_app/public/404.html b/spec/test_apps/rails-4.2.10/public/404.html similarity index 100% rename from spec/test_app/public/404.html rename to spec/test_apps/rails-4.2.10/public/404.html diff --git a/spec/test_app/public/422.html b/spec/test_apps/rails-4.2.10/public/422.html similarity index 100% rename from spec/test_app/public/422.html rename to spec/test_apps/rails-4.2.10/public/422.html diff --git a/spec/test_app/public/500.html b/spec/test_apps/rails-4.2.10/public/500.html similarity index 100% rename from spec/test_app/public/500.html rename to spec/test_apps/rails-4.2.10/public/500.html diff --git a/spec/test_app/public/favicon.ico b/spec/test_apps/rails-4.2.10/public/favicon.ico similarity index 100% rename from spec/test_app/public/favicon.ico rename to spec/test_apps/rails-4.2.10/public/favicon.ico diff --git a/spec/test_apps/setup.rb b/spec/test_apps/setup.rb new file mode 100644 index 00000000..97fdd78f --- /dev/null +++ b/spec/test_apps/setup.rb @@ -0,0 +1,100 @@ +module TestApps + class Setup + def self.call(*args) + new(*args).call + end + + def initialize(rails_version) + @rails_version = rails_version + end + + def call + return if completed? + abort(generate_app_instructions) unless app_exists? + add_symlinks + puts "Done!" + end + + private + + attr_reader :rails_version + + def completed? + app_exists? && symlinks_exist? + end + + def app_exists? + Dir.exists?(root) + end + + def root + File.join(test_apps_root, "rails-#{rails_version}") + end + + def test_apps_root + File.expand_path('..', __FILE__) + end + + def symlinks_exist? + symlink_sources.all? do |source| + File.exist?(symlink_dest(source)) + end + end + + def symlink_sources + Dir[File.join(shared_root, '**/*')].select(&File.method(:file?)) + end + + def symlink_dest(source) + source.sub(shared_root, root) + end + + def shared_root + File.join(test_apps_root, 'shared') + end + + def generate_app_instructions + <<~EOS + + A test app running rails v#{rails_version} needs to be added. + + This can be achieved by running: + + cd /tmp \\ + && gem install rails -v#{rails_version} \\ + && rails _#{rails_version}_ new test_app \\ + --database=sqlite3 \\ + --skip-yarn \\ + --skip-gemfile \\ + --skip-git \\ + --skip-keeps \\ + --skip-action-mailer \\ + --skip-puma \\ + --skip-action-cable \\ + --skip-spring \\ + --skip-listen \\ + --skip-coffee \\ + --skip-turbolinks \\ + --skip-test \\ + --skip-system-test \\ + --skip-bundle \\ + && mv test_app #{root} \\ + && cd #{gem_root} \\ + && bundle exec rake setup_test_app[#{rails_version}] + + EOS + end + + def gem_root + File.expand_path('../../..', __FILE__) + end + + def add_symlinks + symlink_sources.all? do |source| + dest = symlink_dest(source) + FileUtils.mkdir_p File.dirname(dest) + FileUtils.ln_sf source, dest + end + end + end +end diff --git a/spec/test_app/app/mailers/.keep b/spec/test_apps/shared/app/assets/images/.keep similarity index 100% rename from spec/test_app/app/mailers/.keep rename to spec/test_apps/shared/app/assets/images/.keep diff --git a/spec/test_app/app/assets/javascripts/application.js b/spec/test_apps/shared/app/assets/javascripts/application.js similarity index 100% rename from spec/test_app/app/assets/javascripts/application.js rename to spec/test_apps/shared/app/assets/javascripts/application.js diff --git a/spec/test_app/app/assets/stylesheets/application.css b/spec/test_apps/shared/app/assets/stylesheets/application.css similarity index 100% rename from spec/test_app/app/assets/stylesheets/application.css rename to spec/test_apps/shared/app/assets/stylesheets/application.css diff --git a/spec/test_app/app/controllers/application_controller.rb b/spec/test_apps/shared/app/controllers/application_controller.rb similarity index 100% rename from spec/test_app/app/controllers/application_controller.rb rename to spec/test_apps/shared/app/controllers/application_controller.rb diff --git a/spec/test_app/app/models/.keep b/spec/test_apps/shared/app/controllers/concerns/.keep similarity index 100% rename from spec/test_app/app/models/.keep rename to spec/test_apps/shared/app/controllers/concerns/.keep diff --git a/spec/test_app/app/documentation/guide/_content.html.erb b/spec/test_apps/shared/app/documentation/guide/_content.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/_content.html.erb rename to spec/test_apps/shared/app/documentation/guide/_content.html.erb diff --git a/spec/test_app/app/documentation/guide/content.rb b/spec/test_apps/shared/app/documentation/guide/content.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content.rb rename to spec/test_apps/shared/app/documentation/guide/content.rb diff --git a/spec/test_app/app/documentation/guide/content/_documents.html.erb b/spec/test_apps/shared/app/documentation/guide/content/_documents.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/content/_documents.html.erb rename to spec/test_apps/shared/app/documentation/guide/content/_documents.html.erb diff --git a/spec/test_app/app/documentation/guide/content/_structures.html.erb b/spec/test_apps/shared/app/documentation/guide/content/_structures.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/content/_structures.html.erb rename to spec/test_apps/shared/app/documentation/guide/content/_structures.html.erb diff --git a/spec/test_app/app/documentation/guide/content/documents.rb b/spec/test_apps/shared/app/documentation/guide/content/documents.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents.rb diff --git a/spec/test_app/app/documentation/guide/content/documents/_public.html.erb b/spec/test_apps/shared/app/documentation/guide/content/documents/_public.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/_public.html.erb rename to spec/test_apps/shared/app/documentation/guide/content/documents/_public.html.erb diff --git a/spec/test_app/app/documentation/guide/content/documents/_restricted.html.erb b/spec/test_apps/shared/app/documentation/guide/content/documents/_restricted.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/_restricted.html.erb rename to spec/test_apps/shared/app/documentation/guide/content/documents/_restricted.html.erb diff --git a/spec/test_app/app/documentation/guide/content/documents/_unpublished.html.erb b/spec/test_apps/shared/app/documentation/guide/content/documents/_unpublished.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/_unpublished.html.erb rename to spec/test_apps/shared/app/documentation/guide/content/documents/_unpublished.html.erb diff --git a/spec/test_app/app/documentation/guide/content/documents/public.rb b/spec/test_apps/shared/app/documentation/guide/content/documents/public.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/public.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents/public.rb diff --git a/spec/test_app/app/documentation/guide/content/documents/restricted.rb b/spec/test_apps/shared/app/documentation/guide/content/documents/restricted.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/restricted.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents/restricted.rb diff --git a/spec/test_app/app/documentation/guide/content/documents/supported_formats.rb b/spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/supported_formats.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats.rb diff --git a/spec/test_app/app/documentation/guide/content/documents/supported_formats/_html.html.erb b/spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/_html.html.erb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/supported_formats/_html.html.erb rename to spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/_html.html.erb diff --git a/spec/test_app/app/documentation/guide/content/documents/supported_formats/_markdown.md b/spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/_markdown.md similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/supported_formats/_markdown.md rename to spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/_markdown.md diff --git a/spec/test_app/app/documentation/guide/content/documents/supported_formats/html.rb b/spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/html.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/supported_formats/html.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/html.rb diff --git a/spec/test_app/app/documentation/guide/content/documents/supported_formats/markdown.rb b/spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/markdown.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/supported_formats/markdown.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents/supported_formats/markdown.rb diff --git a/spec/test_app/app/documentation/guide/content/documents/unpublished.rb b/spec/test_apps/shared/app/documentation/guide/content/documents/unpublished.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/documents/unpublished.rb rename to spec/test_apps/shared/app/documentation/guide/content/documents/unpublished.rb diff --git a/spec/test_app/app/documentation/guide/content/structures.rb b/spec/test_apps/shared/app/documentation/guide/content/structures.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/structures.rb rename to spec/test_apps/shared/app/documentation/guide/content/structures.rb diff --git a/spec/test_app/app/documentation/guide/content/structures/friendly.rb b/spec/test_apps/shared/app/documentation/guide/content/structures/friendly.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/structures/friendly.rb rename to spec/test_apps/shared/app/documentation/guide/content/structures/friendly.rb diff --git a/spec/test_app/app/documentation/guide/content/structures/friendly/example.rb b/spec/test_apps/shared/app/documentation/guide/content/structures/friendly/example.rb similarity index 100% rename from spec/test_app/app/documentation/guide/content/structures/friendly/example.rb rename to spec/test_apps/shared/app/documentation/guide/content/structures/friendly/example.rb diff --git a/spec/test_app/app/documentation/guide/controller_injection.rb b/spec/test_apps/shared/app/documentation/guide/controller_injection.rb similarity index 100% rename from spec/test_app/app/documentation/guide/controller_injection.rb rename to spec/test_apps/shared/app/documentation/guide/controller_injection.rb diff --git a/spec/test_app/app/helpers/application_helper.rb b/spec/test_apps/shared/app/helpers/application_helper.rb similarity index 100% rename from spec/test_app/app/helpers/application_helper.rb rename to spec/test_apps/shared/app/helpers/application_helper.rb diff --git a/spec/test_app/app/models/concerns/.keep b/spec/test_apps/shared/app/mailers/.keep similarity index 100% rename from spec/test_app/app/models/concerns/.keep rename to spec/test_apps/shared/app/mailers/.keep diff --git a/spec/test_app/lib/assets/.keep b/spec/test_apps/shared/app/models/.keep similarity index 100% rename from spec/test_app/lib/assets/.keep rename to spec/test_apps/shared/app/models/.keep diff --git a/spec/test_app/log/.keep b/spec/test_apps/shared/app/models/concerns/.keep similarity index 100% rename from spec/test_app/log/.keep rename to spec/test_apps/shared/app/models/concerns/.keep diff --git a/spec/test_app/app/views/layouts/application.html.erb b/spec/test_apps/shared/app/views/layouts/application.html.erb similarity index 100% rename from spec/test_app/app/views/layouts/application.html.erb rename to spec/test_apps/shared/app/views/layouts/application.html.erb diff --git a/spec/test_app/app/views/temp/_structure.html.erb b/spec/test_apps/shared/app/views/temp/_structure.html.erb similarity index 100% rename from spec/test_app/app/views/temp/_structure.html.erb rename to spec/test_apps/shared/app/views/temp/_structure.html.erb diff --git a/spec/test_app/config/database.yml b/spec/test_apps/shared/config/database.yml similarity index 100% rename from spec/test_app/config/database.yml rename to spec/test_apps/shared/config/database.yml diff --git a/spec/test_apps/shared/config/initializers/i18n.rb b/spec/test_apps/shared/config/initializers/i18n.rb new file mode 100644 index 00000000..8d19bada --- /dev/null +++ b/spec/test_apps/shared/config/initializers/i18n.rb @@ -0,0 +1 @@ +Rails.application.config.i18n.load_path += Dir[Rails.root.join('../../../config', 'locales', '**', '*.{rb,yml}')]