From 80581f9f1a2bfaed6ae0d5ffd1bd8fb4d4459003 Mon Sep 17 00:00:00 2001 From: Donnie Tognazzini Date: Fri, 6 Jun 2014 15:38:48 -0700 Subject: [PATCH 1/3] adding default Rails 4.0.4 app --- test/test_apps/4.0/.gitignore | 16 ++++ test/test_apps/4.0/Gemfile | 45 +++++++++++ test/test_apps/4.0/README.rdoc | 28 +++++++ test/test_apps/4.0/Rakefile | 6 ++ test/test_apps/4.0/app/assets/images/.keep | 0 .../4.0/app/assets/javascripts/application.js | 16 ++++ .../app/assets/stylesheets/application.css | 13 +++ .../app/controllers/application_controller.rb | 5 ++ .../4.0/app/controllers/concerns/.keep | 0 .../4.0/app/helpers/application_helper.rb | 2 + test/test_apps/4.0/app/mailers/.keep | 0 test/test_apps/4.0/app/models/.keep | 0 test/test_apps/4.0/app/models/concerns/.keep | 0 .../app/views/layouts/application.html.erb | 14 ++++ test/test_apps/4.0/bin/bundle | 3 + test/test_apps/4.0/bin/rails | 4 + test/test_apps/4.0/bin/rake | 4 + test/test_apps/4.0/config.ru | 4 + test/test_apps/4.0/config/application.rb | 23 ++++++ test/test_apps/4.0/config/boot.rb | 4 + test/test_apps/4.0/config/database.yml | 25 ++++++ test/test_apps/4.0/config/environment.rb | 5 ++ .../4.0/config/environments/development.rb | 29 +++++++ .../4.0/config/environments/production.rb | 80 +++++++++++++++++++ .../test_apps/4.0/config/environments/test.rb | 36 +++++++++ .../initializers/backtrace_silencers.rb | 7 ++ .../initializers/filter_parameter_logging.rb | 4 + .../4.0/config/initializers/inflections.rb | 16 ++++ .../4.0/config/initializers/mime_types.rb | 5 ++ .../4.0/config/initializers/secret_token.rb | 12 +++ .../4.0/config/initializers/session_store.rb | 3 + .../config/initializers/wrap_parameters.rb | 14 ++++ test/test_apps/4.0/config/locales/en.yml | 23 ++++++ test/test_apps/4.0/config/routes.rb | 56 +++++++++++++ test/test_apps/4.0/db/seeds.rb | 7 ++ test/test_apps/4.0/lib/assets/.keep | 0 test/test_apps/4.0/lib/tasks/.keep | 0 test/test_apps/4.0/log/.keep | 0 test/test_apps/4.0/public/404.html | 58 ++++++++++++++ test/test_apps/4.0/public/422.html | 58 ++++++++++++++ test/test_apps/4.0/public/500.html | 57 +++++++++++++ test/test_apps/4.0/public/favicon.ico | 0 test/test_apps/4.0/public/robots.txt | 5 ++ test/test_apps/4.0/test/controllers/.keep | 0 test/test_apps/4.0/test/fixtures/.keep | 0 test/test_apps/4.0/test/helpers/.keep | 0 test/test_apps/4.0/test/integration/.keep | 0 test/test_apps/4.0/test/mailers/.keep | 0 test/test_apps/4.0/test/models/.keep | 0 test/test_apps/4.0/test/test_helper.rb | 15 ++++ .../4.0/vendor/assets/javascripts/.keep | 0 .../4.0/vendor/assets/stylesheets/.keep | 0 52 files changed, 702 insertions(+) create mode 100644 test/test_apps/4.0/.gitignore create mode 100644 test/test_apps/4.0/Gemfile create mode 100644 test/test_apps/4.0/README.rdoc create mode 100644 test/test_apps/4.0/Rakefile create mode 100644 test/test_apps/4.0/app/assets/images/.keep create mode 100644 test/test_apps/4.0/app/assets/javascripts/application.js create mode 100644 test/test_apps/4.0/app/assets/stylesheets/application.css create mode 100644 test/test_apps/4.0/app/controllers/application_controller.rb create mode 100644 test/test_apps/4.0/app/controllers/concerns/.keep create mode 100644 test/test_apps/4.0/app/helpers/application_helper.rb create mode 100644 test/test_apps/4.0/app/mailers/.keep create mode 100644 test/test_apps/4.0/app/models/.keep create mode 100644 test/test_apps/4.0/app/models/concerns/.keep create mode 100644 test/test_apps/4.0/app/views/layouts/application.html.erb create mode 100755 test/test_apps/4.0/bin/bundle create mode 100755 test/test_apps/4.0/bin/rails create mode 100755 test/test_apps/4.0/bin/rake create mode 100644 test/test_apps/4.0/config.ru create mode 100644 test/test_apps/4.0/config/application.rb create mode 100644 test/test_apps/4.0/config/boot.rb create mode 100644 test/test_apps/4.0/config/database.yml create mode 100644 test/test_apps/4.0/config/environment.rb create mode 100644 test/test_apps/4.0/config/environments/development.rb create mode 100644 test/test_apps/4.0/config/environments/production.rb create mode 100644 test/test_apps/4.0/config/environments/test.rb create mode 100644 test/test_apps/4.0/config/initializers/backtrace_silencers.rb create mode 100644 test/test_apps/4.0/config/initializers/filter_parameter_logging.rb create mode 100644 test/test_apps/4.0/config/initializers/inflections.rb create mode 100644 test/test_apps/4.0/config/initializers/mime_types.rb create mode 100644 test/test_apps/4.0/config/initializers/secret_token.rb create mode 100644 test/test_apps/4.0/config/initializers/session_store.rb create mode 100644 test/test_apps/4.0/config/initializers/wrap_parameters.rb create mode 100644 test/test_apps/4.0/config/locales/en.yml create mode 100644 test/test_apps/4.0/config/routes.rb create mode 100644 test/test_apps/4.0/db/seeds.rb create mode 100644 test/test_apps/4.0/lib/assets/.keep create mode 100644 test/test_apps/4.0/lib/tasks/.keep create mode 100644 test/test_apps/4.0/log/.keep create mode 100644 test/test_apps/4.0/public/404.html create mode 100644 test/test_apps/4.0/public/422.html create mode 100644 test/test_apps/4.0/public/500.html create mode 100644 test/test_apps/4.0/public/favicon.ico create mode 100644 test/test_apps/4.0/public/robots.txt create mode 100644 test/test_apps/4.0/test/controllers/.keep create mode 100644 test/test_apps/4.0/test/fixtures/.keep create mode 100644 test/test_apps/4.0/test/helpers/.keep create mode 100644 test/test_apps/4.0/test/integration/.keep create mode 100644 test/test_apps/4.0/test/mailers/.keep create mode 100644 test/test_apps/4.0/test/models/.keep create mode 100644 test/test_apps/4.0/test/test_helper.rb create mode 100644 test/test_apps/4.0/vendor/assets/javascripts/.keep create mode 100644 test/test_apps/4.0/vendor/assets/stylesheets/.keep diff --git a/test/test_apps/4.0/.gitignore b/test/test_apps/4.0/.gitignore new file mode 100644 index 00000000..6a502e99 --- /dev/null +++ b/test/test_apps/4.0/.gitignore @@ -0,0 +1,16 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/*.log +/tmp diff --git a/test/test_apps/4.0/Gemfile b/test/test_apps/4.0/Gemfile new file mode 100644 index 00000000..e4a54ba4 --- /dev/null +++ b/test/test_apps/4.0/Gemfile @@ -0,0 +1,45 @@ +source 'https://rubygems.org' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.0.4' + +# Use sqlite3 as the database for Active Record +gem 'sqlite3' + +# Use SCSS for stylesheets +gem 'sass-rails', '~> 4.0.2' + +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' + +# Use CoffeeScript for .js.coffee assets and views +gem 'coffee-rails', '~> 4.0.0' + +# See https://github.com/sstephenson/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' + +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' + +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 1.2' + +group :doc do + # bundle exec rake doc:rails generates the API under doc/api. + gem 'sdoc', require: false +end + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano', group: :development + +# Use debugger +# gem 'debugger', group: [:development, :test] diff --git a/test/test_apps/4.0/README.rdoc b/test/test_apps/4.0/README.rdoc new file mode 100644 index 00000000..dd4e97e2 --- /dev/null +++ b/test/test_apps/4.0/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/test/test_apps/4.0/Rakefile b/test/test_apps/4.0/Rakefile new file mode 100644 index 00000000..ca00632c --- /dev/null +++ b/test/test_apps/4.0/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require File.expand_path('../config/application', __FILE__) + +Bleh::Application.load_tasks diff --git a/test/test_apps/4.0/app/assets/images/.keep b/test/test_apps/4.0/app/assets/images/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/app/assets/javascripts/application.js b/test/test_apps/4.0/app/assets/javascripts/application.js new file mode 100644 index 00000000..d6925fa4 --- /dev/null +++ b/test/test_apps/4.0/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. +// +// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/test/test_apps/4.0/app/assets/stylesheets/application.css b/test/test_apps/4.0/app/assets/stylesheets/application.css new file mode 100644 index 00000000..3192ec89 --- /dev/null +++ b/test/test_apps/4.0/app/assets/stylesheets/application.css @@ -0,0 +1,13 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the top of the + * compiled file, but it's generally better to create a new file per style scope. + * + *= require_self + *= require_tree . + */ diff --git a/test/test_apps/4.0/app/controllers/application_controller.rb b/test/test_apps/4.0/app/controllers/application_controller.rb new file mode 100644 index 00000000..d83690e1 --- /dev/null +++ b/test/test_apps/4.0/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/test/test_apps/4.0/app/controllers/concerns/.keep b/test/test_apps/4.0/app/controllers/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/app/helpers/application_helper.rb b/test/test_apps/4.0/app/helpers/application_helper.rb new file mode 100644 index 00000000..de6be794 --- /dev/null +++ b/test/test_apps/4.0/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/test/test_apps/4.0/app/mailers/.keep b/test/test_apps/4.0/app/mailers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/app/models/.keep b/test/test_apps/4.0/app/models/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/app/models/concerns/.keep b/test/test_apps/4.0/app/models/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/app/views/layouts/application.html.erb b/test/test_apps/4.0/app/views/layouts/application.html.erb new file mode 100644 index 00000000..badc0925 --- /dev/null +++ b/test/test_apps/4.0/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + Bleh + <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> + <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/test/test_apps/4.0/bin/bundle b/test/test_apps/4.0/bin/bundle new file mode 100755 index 00000000..66e9889e --- /dev/null +++ b/test/test_apps/4.0/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/test/test_apps/4.0/bin/rails b/test/test_apps/4.0/bin/rails new file mode 100755 index 00000000..728cd85a --- /dev/null +++ b/test/test_apps/4.0/bin/rails @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/test/test_apps/4.0/bin/rake b/test/test_apps/4.0/bin/rake new file mode 100755 index 00000000..17240489 --- /dev/null +++ b/test/test_apps/4.0/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/test/test_apps/4.0/config.ru b/test/test_apps/4.0/config.ru new file mode 100644 index 00000000..5bc2a619 --- /dev/null +++ b/test/test_apps/4.0/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/test_apps/4.0/config/application.rb b/test/test_apps/4.0/config/application.rb new file mode 100644 index 00000000..895cd71f --- /dev/null +++ b/test/test_apps/4.0/config/application.rb @@ -0,0 +1,23 @@ +require File.expand_path('../boot', __FILE__) + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module Bleh + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # 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 + end +end diff --git a/test/test_apps/4.0/config/boot.rb b/test/test_apps/4.0/config/boot.rb new file mode 100644 index 00000000..5e5f0c1f --- /dev/null +++ b/test/test_apps/4.0/config/boot.rb @@ -0,0 +1,4 @@ +# Set up gems listed in the Gemfile. +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/test/test_apps/4.0/config/database.yml b/test/test_apps/4.0/config/database.yml new file mode 100644 index 00000000..51a4dd45 --- /dev/null +++ b/test/test_apps/4.0/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 diff --git a/test/test_apps/4.0/config/environment.rb b/test/test_apps/4.0/config/environment.rb new file mode 100644 index 00000000..2b17384b --- /dev/null +++ b/test/test_apps/4.0/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# Initialize the Rails application. +Bleh::Application.initialize! diff --git a/test/test_apps/4.0/config/environments/development.rb b/test/test_apps/4.0/config/environments/development.rb new file mode 100644 index 00000000..9853272b --- /dev/null +++ b/test/test_apps/4.0/config/environments/development.rb @@ -0,0 +1,29 @@ +Bleh::Application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true +end diff --git a/test/test_apps/4.0/config/environments/production.rb b/test/test_apps/4.0/config/environments/production.rb new file mode 100644 index 00000000..0d39d615 --- /dev/null +++ b/test/test_apps/4.0/config/environments/production.rb @@ -0,0 +1,80 @@ +Bleh::Application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both thread web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable Rails's static asset server (Apache or nginx will already do this). + config.serve_static_assets = false + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # Generate digests for assets URLs. + config.assets.digest = true + + # Version of your assets, change this if you want to expire all your assets. + config.assets.version = '1.0' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Set to :debug to see everything in the log. + config.log_level = :info + + # Prepend all log lines with the following tags. + # config.log_tags = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = "http://assets.example.com" + + # Precompile additional assets. + # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. + # config.assets.precompile += %w( search.js ) + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation can not be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Disable automatic flushing of the log to improve performance. + # config.autoflush_log = false + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new +end diff --git a/test/test_apps/4.0/config/environments/test.rb b/test/test_apps/4.0/config/environments/test.rb new file mode 100644 index 00000000..a38a76c8 --- /dev/null +++ b/test/test_apps/4.0/config/environments/test.rb @@ -0,0 +1,36 @@ +Bleh::Application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure static asset server for tests with Cache-Control for performance. + config.serve_static_assets = true + config.static_cache_control = "public, max-age=3600" + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr +end diff --git a/test/test_apps/4.0/config/initializers/backtrace_silencers.rb b/test/test_apps/4.0/config/initializers/backtrace_silencers.rb new file mode 100644 index 00000000..59385cdf --- /dev/null +++ b/test/test_apps/4.0/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/test/test_apps/4.0/config/initializers/filter_parameter_logging.rb b/test/test_apps/4.0/config/initializers/filter_parameter_logging.rb new file mode 100644 index 00000000..4a994e1e --- /dev/null +++ b/test/test_apps/4.0/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/test/test_apps/4.0/config/initializers/inflections.rb b/test/test_apps/4.0/config/initializers/inflections.rb new file mode 100644 index 00000000..ac033bf9 --- /dev/null +++ b/test/test_apps/4.0/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/test/test_apps/4.0/config/initializers/mime_types.rb b/test/test_apps/4.0/config/initializers/mime_types.rb new file mode 100644 index 00000000..72aca7e4 --- /dev/null +++ b/test/test_apps/4.0/config/initializers/mime_types.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf +# Mime::Type.register_alias "text/html", :iphone diff --git a/test/test_apps/4.0/config/initializers/secret_token.rb b/test/test_apps/4.0/config/initializers/secret_token.rb new file mode 100644 index 00000000..25f88ec3 --- /dev/null +++ b/test/test_apps/4.0/config/initializers/secret_token.rb @@ -0,0 +1,12 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure your secret_key_base is kept private +# if you're sharing your code publicly. +Bleh::Application.config.secret_key_base = '3b3bfb0dd3b5a41982691b6dca1a114ee2026fc70cfa1e773613aff2ed4271b36e066067a4d97a49330620c40d7069458eee559b43f8b2de8e1604a36fa4f7a2' diff --git a/test/test_apps/4.0/config/initializers/session_store.rb b/test/test_apps/4.0/config/initializers/session_store.rb new file mode 100644 index 00000000..6093fe73 --- /dev/null +++ b/test/test_apps/4.0/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Bleh::Application.config.session_store :cookie_store, key: '_bleh_session' diff --git a/test/test_apps/4.0/config/initializers/wrap_parameters.rb b/test/test_apps/4.0/config/initializers/wrap_parameters.rb new file mode 100644 index 00000000..33725e95 --- /dev/null +++ b/test/test_apps/4.0/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] if respond_to?(:wrap_parameters) +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/test/test_apps/4.0/config/locales/en.yml b/test/test_apps/4.0/config/locales/en.yml new file mode 100644 index 00000000..06539571 --- /dev/null +++ b/test/test_apps/4.0/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/test/test_apps/4.0/config/routes.rb b/test/test_apps/4.0/config/routes.rb new file mode 100644 index 00000000..174aa49a --- /dev/null +++ b/test/test_apps/4.0/config/routes.rb @@ -0,0 +1,56 @@ +Bleh::Application.routes.draw do + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + # root 'welcome#index' + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/test/test_apps/4.0/db/seeds.rb b/test/test_apps/4.0/db/seeds.rb new file mode 100644 index 00000000..4edb1e85 --- /dev/null +++ b/test/test_apps/4.0/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/test/test_apps/4.0/lib/assets/.keep b/test/test_apps/4.0/lib/assets/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/lib/tasks/.keep b/test/test_apps/4.0/lib/tasks/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/log/.keep b/test/test_apps/4.0/log/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/public/404.html b/test/test_apps/4.0/public/404.html new file mode 100644 index 00000000..a0daa0c1 --- /dev/null +++ b/test/test_apps/4.0/public/404.html @@ -0,0 +1,58 @@ + + + + The page you were looking for doesn't exist (404) + + + + + +
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+ + diff --git a/test/test_apps/4.0/public/422.html b/test/test_apps/4.0/public/422.html new file mode 100644 index 00000000..fbb4b84d --- /dev/null +++ b/test/test_apps/4.0/public/422.html @@ -0,0 +1,58 @@ + + + + The change you wanted was rejected (422) + + + + + +
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+ + diff --git a/test/test_apps/4.0/public/500.html b/test/test_apps/4.0/public/500.html new file mode 100644 index 00000000..e9052d35 --- /dev/null +++ b/test/test_apps/4.0/public/500.html @@ -0,0 +1,57 @@ + + + + We're sorry, but something went wrong (500) + + + + + +
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+ + diff --git a/test/test_apps/4.0/public/favicon.ico b/test/test_apps/4.0/public/favicon.ico new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/public/robots.txt b/test/test_apps/4.0/public/robots.txt new file mode 100644 index 00000000..3c9c7c01 --- /dev/null +++ b/test/test_apps/4.0/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/test_apps/4.0/test/controllers/.keep b/test/test_apps/4.0/test/controllers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/test/fixtures/.keep b/test/test_apps/4.0/test/fixtures/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/test/helpers/.keep b/test/test_apps/4.0/test/helpers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/test/integration/.keep b/test/test_apps/4.0/test/integration/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/test/mailers/.keep b/test/test_apps/4.0/test/mailers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/test/models/.keep b/test/test_apps/4.0/test/models/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/test/test_helper.rb b/test/test_apps/4.0/test/test_helper.rb new file mode 100644 index 00000000..bc7e05d7 --- /dev/null +++ b/test/test_apps/4.0/test/test_helper.rb @@ -0,0 +1,15 @@ +ENV["RAILS_ENV"] ||= "test" +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + ActiveRecord::Migration.check_pending! + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + # + # Note: You'll currently still have to declare fixtures explicitly in integration tests + # -- they do not yet inherit this setting + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/test/test_apps/4.0/vendor/assets/javascripts/.keep b/test/test_apps/4.0/vendor/assets/javascripts/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/4.0/vendor/assets/stylesheets/.keep b/test/test_apps/4.0/vendor/assets/stylesheets/.keep new file mode 100644 index 00000000..e69de29b From 85e1856d4bea4f44707ed05b39b3c8bbbe3a9d5f Mon Sep 17 00:00:00 2001 From: Donnie Tognazzini Date: Fri, 6 Jun 2014 15:57:26 -0700 Subject: [PATCH 2/3] preparing rails 4 app for testing --- .travis.yml | 1 + gemfiles/capybara_1.1_ruby2.0.0.gemfile | 1 + gemfiles/capybara_2.1_ruby2.0.0.gemfile | 1 + gemfiles/capybara_2.2_ruby2.0.0.gemfile | 1 + .../core/application_router.rb | 23 +++--- test/test_apps/4.0/Appraisals | 26 ++++++ test/test_apps/4.0/Gemfile | 29 ++----- test/test_apps/4.0/Rakefile | 10 ++- .../4.0/app/assets/javascripts/authors.js | 11 +++ .../4.0/app/assets/javascripts/books.js | 2 + .../app/assets/stylesheets/authors.css.scss | 3 + .../4.0/app/assets/stylesheets/books.css.scss | 3 + .../app/assets/stylesheets/scaffolds.css.scss | 69 ++++++++++++++++ .../4.0/app/controllers/authors_controller.rb | 81 +++++++++++++++++++ .../4.0/app/controllers/books_controller.rb | 77 ++++++++++++++++++ .../4.0/app/controllers/concerns/.keep | 0 .../4.0/app/helpers/authors_helper.rb | 2 + .../test_apps/4.0/app/helpers/books_helper.rb | 2 + test/test_apps/4.0/app/models | 1 + test/test_apps/4.0/app/models/.keep | 0 test/test_apps/4.0/app/models/concerns/.keep | 0 .../4.0/app/views/authors/_form.html.erb | 1 + .../4.0/app/views/authors/edit.html.erb | 1 + .../4.0/app/views/authors/index.html.erb | 26 ++++++ .../4.0/app/views/authors/index.json.jbuilder | 4 + .../4.0/app/views/authors/new.html.erb | 1 + .../4.0/app/views/authors/show.html.erb | 1 + .../4.0/app/views/authors/show.json.jbuilder | 1 + test/test_apps/4.0/app/views/books | 1 + .../app/views/layouts/application.html.erb | 2 +- test/test_apps/4.0/config/application.rb | 2 +- test/test_apps/4.0/config/database.yml | 18 ----- test/test_apps/4.0/config/environment.rb | 2 +- .../4.0/config/environments/development.rb | 2 +- .../4.0/config/environments/production.rb | 2 +- .../test_apps/4.0/config/environments/test.rb | 2 +- .../initializers/backtrace_silencers.rb | 2 +- .../4.0/config/initializers/secret_token.rb | 3 +- .../4.0/config/initializers/session_store.rb | 2 +- test/test_apps/4.0/config/routes.rb | 58 +------------ test/test_apps/4.0/db | 1 + test/test_apps/4.0/db/seeds.rb | 7 -- .../gemfiles/capybara_1.1_ruby1.9.3.gemfile | 18 +++++ .../gemfiles/capybara_2.1_ruby1.9.3.gemfile | 18 +++++ .../gemfiles/capybara_2.1_ruby2.0.0.gemfile | 18 +++++ .../gemfiles/capybara_2.2_ruby1.9.3.gemfile | 18 +++++ .../gemfiles/capybara_2.2_ruby2.0.0.gemfile | 18 +++++ test/test_apps/4.0/test | 1 + test/test_apps/4.0/test/controllers/.keep | 0 test/test_apps/4.0/test/fixtures/.keep | 0 test/test_apps/4.0/test/helpers/.keep | 0 test/test_apps/4.0/test/integration/.keep | 0 test/test_apps/4.0/test/mailers/.keep | 0 test/test_apps/4.0/test/models/.keep | 0 test/test_apps/4.0/test/test_helper.rb | 15 ---- 55 files changed, 449 insertions(+), 139 deletions(-) create mode 100644 test/test_apps/4.0/Appraisals create mode 100644 test/test_apps/4.0/app/assets/javascripts/authors.js create mode 100644 test/test_apps/4.0/app/assets/javascripts/books.js create mode 100644 test/test_apps/4.0/app/assets/stylesheets/authors.css.scss create mode 100644 test/test_apps/4.0/app/assets/stylesheets/books.css.scss create mode 100644 test/test_apps/4.0/app/assets/stylesheets/scaffolds.css.scss create mode 100644 test/test_apps/4.0/app/controllers/authors_controller.rb create mode 100644 test/test_apps/4.0/app/controllers/books_controller.rb delete mode 100644 test/test_apps/4.0/app/controllers/concerns/.keep create mode 100644 test/test_apps/4.0/app/helpers/authors_helper.rb create mode 100644 test/test_apps/4.0/app/helpers/books_helper.rb create mode 120000 test/test_apps/4.0/app/models delete mode 100644 test/test_apps/4.0/app/models/.keep delete mode 100644 test/test_apps/4.0/app/models/concerns/.keep create mode 120000 test/test_apps/4.0/app/views/authors/_form.html.erb create mode 120000 test/test_apps/4.0/app/views/authors/edit.html.erb create mode 100644 test/test_apps/4.0/app/views/authors/index.html.erb create mode 100644 test/test_apps/4.0/app/views/authors/index.json.jbuilder create mode 120000 test/test_apps/4.0/app/views/authors/new.html.erb create mode 120000 test/test_apps/4.0/app/views/authors/show.html.erb create mode 100644 test/test_apps/4.0/app/views/authors/show.json.jbuilder create mode 120000 test/test_apps/4.0/app/views/books create mode 120000 test/test_apps/4.0/db delete mode 100644 test/test_apps/4.0/db/seeds.rb create mode 100644 test/test_apps/4.0/gemfiles/capybara_1.1_ruby1.9.3.gemfile create mode 100644 test/test_apps/4.0/gemfiles/capybara_2.1_ruby1.9.3.gemfile create mode 100644 test/test_apps/4.0/gemfiles/capybara_2.1_ruby2.0.0.gemfile create mode 100644 test/test_apps/4.0/gemfiles/capybara_2.2_ruby1.9.3.gemfile create mode 100644 test/test_apps/4.0/gemfiles/capybara_2.2_ruby2.0.0.gemfile create mode 120000 test/test_apps/4.0/test delete mode 100644 test/test_apps/4.0/test/controllers/.keep delete mode 100644 test/test_apps/4.0/test/fixtures/.keep delete mode 100644 test/test_apps/4.0/test/helpers/.keep delete mode 100644 test/test_apps/4.0/test/integration/.keep delete mode 100644 test/test_apps/4.0/test/mailers/.keep delete mode 100644 test/test_apps/4.0/test/models/.keep delete mode 100644 test/test_apps/4.0/test/test_helper.rb diff --git a/.travis.yml b/.travis.yml index ebad92f6..6d197698 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ script: "bundle exec rake test:ci" # - RAILS_VERSION=3.0 # - RAILS_VERSION=3.1 # - RAILS_VERSION=3.2 +# - RAILS_VERSION=4.0 # - UNITS=true # #matrix: diff --git a/gemfiles/capybara_1.1_ruby2.0.0.gemfile b/gemfiles/capybara_1.1_ruby2.0.0.gemfile index 2c2d399d..ff9d0213 100644 --- a/gemfiles/capybara_1.1_ruby2.0.0.gemfile +++ b/gemfiles/capybara_1.1_ruby2.0.0.gemfile @@ -6,6 +6,7 @@ gem "appraisal", "~> 0.5.1" gem "mocha", "= 0.13.3" gem "selenium-webdriver", ">= 0" gem "gem-release" +gem "test-unit" gem "capybara", "~> 1.1.4" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/capybara_2.1_ruby2.0.0.gemfile b/gemfiles/capybara_2.1_ruby2.0.0.gemfile index 5b17eb63..65381c10 100644 --- a/gemfiles/capybara_2.1_ruby2.0.0.gemfile +++ b/gemfiles/capybara_2.1_ruby2.0.0.gemfile @@ -6,6 +6,7 @@ gem "appraisal", "~> 0.5.1" gem "mocha", "= 0.13.3" gem "selenium-webdriver", ">= 0" gem "gem-release" +gem "test-unit" gem "capybara", "~> 2.1.0" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/capybara_2.2_ruby2.0.0.gemfile b/gemfiles/capybara_2.2_ruby2.0.0.gemfile index 73e8fe4d..e4d8cf36 100644 --- a/gemfiles/capybara_2.2_ruby2.0.0.gemfile +++ b/gemfiles/capybara_2.2_ruby2.0.0.gemfile @@ -6,6 +6,7 @@ gem "appraisal", "~> 0.5.1" gem "mocha", "= 0.13.3" gem "selenium-webdriver", ">= 0" gem "gem-release" +gem "test-unit" gem "capybara", "~> 2.2.0" gemspec :path=>"../" \ No newline at end of file diff --git a/lib/ae_page_objects/core/application_router.rb b/lib/ae_page_objects/core/application_router.rb index abec9281..374d07a6 100644 --- a/lib/ae_page_objects/core/application_router.rb +++ b/lib/ae_page_objects/core/application_router.rb @@ -55,7 +55,7 @@ def recognizes?(path, url) private def request_for(url, method) - Rails.application.routes.request_class.new(env_for(url, method)) + ::Rails.application.routes.request_class.new(env_for(url, method)) end def env_for(url, method) @@ -68,7 +68,7 @@ def env_for(url, method) def url_and_router(url) url = Rack::Mount::Utils.normalize_path(url) unless url =~ %r{://} - router = Rails.application.routes.set + router = ::Rails.application.routes.set [url, router] end @@ -76,7 +76,7 @@ def url_and_router(url) def routes @routes ||= begin routes_class = Class.new do - include Rails.application.routes.url_helpers + include ::Rails.application.routes.url_helpers end routes_class.new end @@ -88,7 +88,7 @@ class Rails32 < Rails3 private def url_and_router(url) url = Journey::Router::Utils.normalize_path(url) unless url =~ %r{://} - router = Rails.application.routes.router + router = ::Rails.application.routes.router [url, router] end @@ -100,7 +100,7 @@ class Rails4 < Rails32 def url_and_router(url) require 'action_dispatch/journey' url = ActionDispatch::Journey::Router::Utils.normalize_path(url) unless url =~ %r{://} - router = Rails.application.routes.router + router = ::Rails.application.routes.router [url, router] end @@ -128,18 +128,17 @@ def generate_path(named_route, *args) def recognizer @recognizer ||= begin - if Rails.version =~ /\A2\.3/ + if ::Rails.version =~ /\A2\.3/ Recognizer::Rails23.new - elsif Rails.version =~ /\A3\.[01]/ + elsif ::Rails.version =~ /\A3\.[01]/ Recognizer::Rails3.new - elsif Rails.version =~ /\A3\.2/ + elsif ::Rails.version =~ /\A3\.2/ Recognizer::Rails32.new - elsif Rails.version =~ /\A4\.[01]/ - warn "[WARNING]: AePageObjects works but is not thoroughly tested against Rails 4. Caveat emptor." + elsif ::Rails.version =~ /\A4\.[01]/ Recognizer::Rails4.new else - warn "[WARNING]: AePageObjects is not tested against Rails #{Rails.version} and may behave in an undefined manner." - Recognizer::Rails32.new + warn "[WARNING]: AePageObjects is not tested against Rails #{::Rails.version} and may behave in an undefined manner." + Recognizer::Rails4.new end end end diff --git a/test/test_apps/4.0/Appraisals b/test/test_apps/4.0/Appraisals new file mode 100644 index 00000000..9a6a5466 --- /dev/null +++ b/test/test_apps/4.0/Appraisals @@ -0,0 +1,26 @@ +case(RUBY_VERSION) +when '1.9.3' then + + appraise "capybara-1.1-ruby#{RUBY_VERSION}" do + gem 'capybara', '~> 1.1.4' + end + + appraise "capybara-2.1-ruby#{RUBY_VERSION}" do + gem 'capybara', '~> 2.1.0' + end + + appraise "capybara-2.2-ruby#{RUBY_VERSION}" do + gem 'capybara', '~> 2.2.0' + end + +when '2.0.0' then + + appraise "capybara-2.1-ruby#{RUBY_VERSION}" do + gem 'capybara', '~> 2.1.0' + end + + appraise "capybara-2.2-ruby#{RUBY_VERSION}" do + gem 'capybara', '~> 2.2.0' + end + +end diff --git a/test/test_apps/4.0/Gemfile b/test/test_apps/4.0/Gemfile index e4a54ba4..ce6a364f 100644 --- a/test/test_apps/4.0/Gemfile +++ b/test/test_apps/4.0/Gemfile @@ -8,6 +8,13 @@ gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.2' +gem 'jquery-rails' + +gem "selenium-webdriver" +gem "mocha", "0.13.3", :require => false +gem "appraisal", "~> 0.5.1" + +gem 'ae_page_objects', :path => "../../../.." # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' @@ -15,31 +22,9 @@ gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' -# See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby - -# Use jquery as the JavaScript library -gem 'jquery-rails' - # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' -group :doc do - # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false -end - -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - -# Use unicorn as the app server -# gem 'unicorn' - -# Use Capistrano for deployment -# gem 'capistrano', group: :development - -# Use debugger -# gem 'debugger', group: [:development, :test] diff --git a/test/test_apps/4.0/Rakefile b/test/test_apps/4.0/Rakefile index ca00632c..5d5e65f2 100644 --- a/test/test_apps/4.0/Rakefile +++ b/test/test_apps/4.0/Rakefile @@ -3,4 +3,12 @@ require File.expand_path('../config/application', __FILE__) -Bleh::Application.load_tasks +TestApp::Application.load_tasks + +namespace :test do + Rake::TestTask.new(:selenium) do |t| + t.libs << "test" + t.pattern = 'test/selenium/**/*_test.rb' + t.verbose = true + end +end diff --git a/test/test_apps/4.0/app/assets/javascripts/authors.js b/test/test_apps/4.0/app/assets/javascripts/authors.js new file mode 100644 index 00000000..7547b3bb --- /dev/null +++ b/test/test_apps/4.0/app/assets/javascripts/authors.js @@ -0,0 +1,11 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. + + +$(function() { + $('.js-delay-show').on('click', function(event) { + setTimeout(function() { + window.location.href = event.target.getAttribute("data-href"); + }, 3000); + }) +}) \ No newline at end of file diff --git a/test/test_apps/4.0/app/assets/javascripts/books.js b/test/test_apps/4.0/app/assets/javascripts/books.js new file mode 100644 index 00000000..dee720fa --- /dev/null +++ b/test/test_apps/4.0/app/assets/javascripts/books.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/test/test_apps/4.0/app/assets/stylesheets/authors.css.scss b/test/test_apps/4.0/app/assets/stylesheets/authors.css.scss new file mode 100644 index 00000000..7adde770 --- /dev/null +++ b/test/test_apps/4.0/app/assets/stylesheets/authors.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Authors controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/test/test_apps/4.0/app/assets/stylesheets/books.css.scss b/test/test_apps/4.0/app/assets/stylesheets/books.css.scss new file mode 100644 index 00000000..9fab565c --- /dev/null +++ b/test/test_apps/4.0/app/assets/stylesheets/books.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Books controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/test/test_apps/4.0/app/assets/stylesheets/scaffolds.css.scss b/test/test_apps/4.0/app/assets/stylesheets/scaffolds.css.scss new file mode 100644 index 00000000..6ec6a8ff --- /dev/null +++ b/test/test_apps/4.0/app/assets/stylesheets/scaffolds.css.scss @@ -0,0 +1,69 @@ +body { + background-color: #fff; + color: #333; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +pre { + background-color: #eee; + padding: 10px; + font-size: 11px; +} + +a { + color: #000; + &:visited { + color: #666; + } + &:hover { + color: #fff; + background-color: #000; + } +} + +div { + &.field, &.actions { + margin-bottom: 10px; + } +} + +#notice { + color: green; +} + +.field_with_errors { + padding: 2px; + background-color: red; + display: table; +} + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px; + padding-bottom: 0; + margin-bottom: 20px; + background-color: #f0f0f0; + h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px; + margin-bottom: 0px; + background-color: #c00; + color: #fff; + } + ul li { + font-size: 12px; + list-style: square; + } +} diff --git a/test/test_apps/4.0/app/controllers/authors_controller.rb b/test/test_apps/4.0/app/controllers/authors_controller.rb new file mode 100644 index 00000000..672b8474 --- /dev/null +++ b/test/test_apps/4.0/app/controllers/authors_controller.rb @@ -0,0 +1,81 @@ +class AuthorsController < ApplicationController + before_action :set_author, only: [:show, :edit, :update, :destroy] + + # GET /authors + # GET /authors.json + def index + @authors = Author.order(:last_name) + end + + class << self + attr_accessor :last_name_display_delay_ms + end + + # GET /authors/1 + # GET /authors/1.json + def show + @last_name_display_delay_ms = self.class.last_name_display_delay_ms + end + + # GET /authors/new + def new + @author = Author.new + @author.books.build + @author.books.build + end + + # GET /authors/1/edit + def edit + end + + # POST /authors + # POST /authors.json + def create + @author = Author.new(author_params) + + respond_to do |format| + if @author.save + format.html { redirect_to @author, notice: 'Author was successfully created.' } + format.json { render action: 'show', status: :created, location: @author } + else + format.html { render action: 'new' } + format.json { render json: @author.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /authors/1 + # PATCH/PUT /authors/1.json + def update + respond_to do |format| + if @author.update(author_params) + format.html { redirect_to @author, notice: 'Author was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @author.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /authors/1 + # DELETE /authors/1.json + def destroy + @author.destroy + respond_to do |format| + format.html { redirect_to authors_url } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_author + @author = Author.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def author_params + params[:author] + end +end diff --git a/test/test_apps/4.0/app/controllers/books_controller.rb b/test/test_apps/4.0/app/controllers/books_controller.rb new file mode 100644 index 00000000..9fc7d757 --- /dev/null +++ b/test/test_apps/4.0/app/controllers/books_controller.rb @@ -0,0 +1,77 @@ +class BooksController < ApplicationController + before_action :set_book, only: [:show, :edit, :update, :destroy] + + # GET /books + # GET /books.json + def index + @books = Book.all + end + + # GET /books/1 + # GET /books/1.json + def show + end + + # GET /books/new + def new + @book = Book.new + @book.build_author + @book.build_index + end + + # GET /books/1/edit + def edit + end + + # POST /books + # POST /books.json + def create + @book = Book.new(book_params) + @book.index.book = @book + + respond_to do |format| + if @book.save + format.html { redirect_to @book, notice: 'Book was successfully created.' } + format.json { render action: 'show', status: :created, location: @book } + else + format.html { render action: 'new' } + format.json { render json: @book.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /books/1 + # PATCH/PUT /books/1.json + def update + respond_to do |format| + if @book.update(book_params) + format.html { redirect_to @book, notice: 'Book was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @book.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /books/1 + # DELETE /books/1.json + def destroy + @book.destroy + respond_to do |format| + format.html { redirect_to books_url } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_book + @book = Book.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def book_params + params[:book].permit! + end +end diff --git a/test/test_apps/4.0/app/controllers/concerns/.keep b/test/test_apps/4.0/app/controllers/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/app/helpers/authors_helper.rb b/test/test_apps/4.0/app/helpers/authors_helper.rb new file mode 100644 index 00000000..f22e1f9a --- /dev/null +++ b/test/test_apps/4.0/app/helpers/authors_helper.rb @@ -0,0 +1,2 @@ +module AuthorsHelper +end diff --git a/test/test_apps/4.0/app/helpers/books_helper.rb b/test/test_apps/4.0/app/helpers/books_helper.rb new file mode 100644 index 00000000..4b9311e0 --- /dev/null +++ b/test/test_apps/4.0/app/helpers/books_helper.rb @@ -0,0 +1,2 @@ +module BooksHelper +end diff --git a/test/test_apps/4.0/app/models b/test/test_apps/4.0/app/models new file mode 120000 index 00000000..d8960757 --- /dev/null +++ b/test/test_apps/4.0/app/models @@ -0,0 +1 @@ +../../shared/models \ No newline at end of file diff --git a/test/test_apps/4.0/app/models/.keep b/test/test_apps/4.0/app/models/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/app/models/concerns/.keep b/test/test_apps/4.0/app/models/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/app/views/authors/_form.html.erb b/test/test_apps/4.0/app/views/authors/_form.html.erb new file mode 120000 index 00000000..b6f2edc1 --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/_form.html.erb @@ -0,0 +1 @@ +../../../../shared/views/authors/_form.html.erb \ No newline at end of file diff --git a/test/test_apps/4.0/app/views/authors/edit.html.erb b/test/test_apps/4.0/app/views/authors/edit.html.erb new file mode 120000 index 00000000..1bf95918 --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/edit.html.erb @@ -0,0 +1 @@ +../../../../shared/views/authors/edit.html.erb \ No newline at end of file diff --git a/test/test_apps/4.0/app/views/authors/index.html.erb b/test/test_apps/4.0/app/views/authors/index.html.erb new file mode 100644 index 00000000..6a2ec5af --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/index.html.erb @@ -0,0 +1,26 @@ +<%= content_for :javascript do %> + <%= javascript_include_tag "authors" %> +<% end %> + +

Listing authors

+ + + + + <% @authors.each do |author| %> + + + + + + + + + + <% end %> + +
<%= author.first_name %><%= author.last_name %><%= link_to 'Show', author %>Delayed Show<%= link_to 'Show In New Window', author, :target => '_blank' %><%= link_to 'Edit', edit_author_path(author) %><%= link_to 'Destroy', author, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Author', new_author_path %> diff --git a/test/test_apps/4.0/app/views/authors/index.json.jbuilder b/test/test_apps/4.0/app/views/authors/index.json.jbuilder new file mode 100644 index 00000000..c479469b --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/index.json.jbuilder @@ -0,0 +1,4 @@ +json.array!(@authors) do |author| + json.extract! author, :id + json.url author_url(author, format: :json) +end diff --git a/test/test_apps/4.0/app/views/authors/new.html.erb b/test/test_apps/4.0/app/views/authors/new.html.erb new file mode 120000 index 00000000..6c41aefd --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/new.html.erb @@ -0,0 +1 @@ +../../../../shared/views/authors/new.html.erb \ No newline at end of file diff --git a/test/test_apps/4.0/app/views/authors/show.html.erb b/test/test_apps/4.0/app/views/authors/show.html.erb new file mode 120000 index 00000000..9c434e47 --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/show.html.erb @@ -0,0 +1 @@ +../../../../shared/views/authors/show.html.erb \ No newline at end of file diff --git a/test/test_apps/4.0/app/views/authors/show.json.jbuilder b/test/test_apps/4.0/app/views/authors/show.json.jbuilder new file mode 100644 index 00000000..ea21ee23 --- /dev/null +++ b/test/test_apps/4.0/app/views/authors/show.json.jbuilder @@ -0,0 +1 @@ +json.extract! @author, :id, :created_at, :updated_at diff --git a/test/test_apps/4.0/app/views/books b/test/test_apps/4.0/app/views/books new file mode 120000 index 00000000..51368403 --- /dev/null +++ b/test/test_apps/4.0/app/views/books @@ -0,0 +1 @@ +../../../shared/views/books/ \ No newline at end of file diff --git a/test/test_apps/4.0/app/views/layouts/application.html.erb b/test/test_apps/4.0/app/views/layouts/application.html.erb index badc0925..fea782fa 100644 --- a/test/test_apps/4.0/app/views/layouts/application.html.erb +++ b/test/test_apps/4.0/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - Bleh + TestApp <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> <%= csrf_meta_tags %> diff --git a/test/test_apps/4.0/config/application.rb b/test/test_apps/4.0/config/application.rb index 895cd71f..6e479159 100644 --- a/test/test_apps/4.0/config/application.rb +++ b/test/test_apps/4.0/config/application.rb @@ -6,7 +6,7 @@ # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -module Bleh +module TestApp class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers diff --git a/test/test_apps/4.0/config/database.yml b/test/test_apps/4.0/config/database.yml index 51a4dd45..89234014 100644 --- a/test/test_apps/4.0/config/database.yml +++ b/test/test_apps/4.0/config/database.yml @@ -1,25 +1,7 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' development: adapter: sqlite3 database: db/development.sqlite3 - pool: 5 - timeout: 5000 -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. test: adapter: sqlite3 database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/test/test_apps/4.0/config/environment.rb b/test/test_apps/4.0/config/environment.rb index 2b17384b..5d1d053d 100644 --- a/test/test_apps/4.0/config/environment.rb +++ b/test/test_apps/4.0/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the Rails application. -Bleh::Application.initialize! +TestApp::Application.initialize! diff --git a/test/test_apps/4.0/config/environments/development.rb b/test/test_apps/4.0/config/environments/development.rb index 9853272b..86f2c590 100644 --- a/test/test_apps/4.0/config/environments/development.rb +++ b/test/test_apps/4.0/config/environments/development.rb @@ -1,4 +1,4 @@ -Bleh::Application.configure do +TestApp::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # In the development environment your application's code is reloaded on diff --git a/test/test_apps/4.0/config/environments/production.rb b/test/test_apps/4.0/config/environments/production.rb index 0d39d615..a166b5ef 100644 --- a/test/test_apps/4.0/config/environments/production.rb +++ b/test/test_apps/4.0/config/environments/production.rb @@ -1,4 +1,4 @@ -Bleh::Application.configure do +TestApp::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. diff --git a/test/test_apps/4.0/config/environments/test.rb b/test/test_apps/4.0/config/environments/test.rb index a38a76c8..c69b91b4 100644 --- a/test/test_apps/4.0/config/environments/test.rb +++ b/test/test_apps/4.0/config/environments/test.rb @@ -1,4 +1,4 @@ -Bleh::Application.configure do +TestApp::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # The test environment is used exclusively to run your application's diff --git a/test/test_apps/4.0/config/initializers/backtrace_silencers.rb b/test/test_apps/4.0/config/initializers/backtrace_silencers.rb index 59385cdf..56ddc8da 100644 --- a/test/test_apps/4.0/config/initializers/backtrace_silencers.rb +++ b/test/test_apps/4.0/config/initializers/backtrace_silencers.rb @@ -4,4 +4,4 @@ # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! +Rails.backtrace_cleaner.remove_silencers! diff --git a/test/test_apps/4.0/config/initializers/secret_token.rb b/test/test_apps/4.0/config/initializers/secret_token.rb index 25f88ec3..777b8a5e 100644 --- a/test/test_apps/4.0/config/initializers/secret_token.rb +++ b/test/test_apps/4.0/config/initializers/secret_token.rb @@ -9,4 +9,5 @@ # Make sure your secret_key_base is kept private # if you're sharing your code publicly. -Bleh::Application.config.secret_key_base = '3b3bfb0dd3b5a41982691b6dca1a114ee2026fc70cfa1e773613aff2ed4271b36e066067a4d97a49330620c40d7069458eee559b43f8b2de8e1604a36fa4f7a2' +TestApp::Application.config.secret_key_base = '3b3bfb0dd3b5a41982691b6dca1a114ee2026fc70cfa1e773613aff2ed4271b36e066067a4d97a49330620c40d7069458eee559b43f8b2de8e1604a36fa4f7a2' +TestApp::Application.config.secret_token = '11e07bbab31134df2f2e561e41a6ebfdcd0c060cefe35b34d376b196572150adda846eb3de1242878dd2d34aa1d2d12ae3c93185516d6722b7ce4342ed16334d' diff --git a/test/test_apps/4.0/config/initializers/session_store.rb b/test/test_apps/4.0/config/initializers/session_store.rb index 6093fe73..91ae93f8 100644 --- a/test/test_apps/4.0/config/initializers/session_store.rb +++ b/test/test_apps/4.0/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Bleh::Application.config.session_store :cookie_store, key: '_bleh_session' +TestApp::Application.config.session_store :cookie_store, key: '_bleh_session' diff --git a/test/test_apps/4.0/config/routes.rb b/test/test_apps/4.0/config/routes.rb index 174aa49a..2c588170 100644 --- a/test/test_apps/4.0/config/routes.rb +++ b/test/test_apps/4.0/config/routes.rb @@ -1,56 +1,4 @@ -Bleh::Application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end +TestApp::Application.routes.draw do + resources :books, :authors + root :to => "books#index" end diff --git a/test/test_apps/4.0/db b/test/test_apps/4.0/db new file mode 120000 index 00000000..a21da8ad --- /dev/null +++ b/test/test_apps/4.0/db @@ -0,0 +1 @@ +../shared/db \ No newline at end of file diff --git a/test/test_apps/4.0/db/seeds.rb b/test/test_apps/4.0/db/seeds.rb deleted file mode 100644 index 4edb1e85..00000000 --- a/test/test_apps/4.0/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) -# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/test/test_apps/4.0/gemfiles/capybara_1.1_ruby1.9.3.gemfile b/test/test_apps/4.0/gemfiles/capybara_1.1_ruby1.9.3.gemfile new file mode 100644 index 00000000..dfcbc12c --- /dev/null +++ b/test/test_apps/4.0/gemfiles/capybara_1.1_ruby1.9.3.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "4.0.4" +gem "sqlite3" +gem "sass-rails", "~> 4.0.2" +gem "jquery-rails" +gem "selenium-webdriver" +gem "mocha", "0.13.3", :require=>false +gem "appraisal", "~> 0.5.1" +gem "ae_page_objects", :path=>"../../../.." +gem "uglifier", ">= 1.3.0" +gem "coffee-rails", "~> 4.0.0" +gem "turbolinks" +gem "jbuilder", "~> 1.2" +gem "capybara", "~> 1.1.4" + diff --git a/test/test_apps/4.0/gemfiles/capybara_2.1_ruby1.9.3.gemfile b/test/test_apps/4.0/gemfiles/capybara_2.1_ruby1.9.3.gemfile new file mode 100644 index 00000000..42d7d033 --- /dev/null +++ b/test/test_apps/4.0/gemfiles/capybara_2.1_ruby1.9.3.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "4.0.4" +gem "sqlite3" +gem "sass-rails", "~> 4.0.2" +gem "jquery-rails" +gem "selenium-webdriver" +gem "mocha", "0.13.3", :require=>false +gem "appraisal", "~> 0.5.1" +gem "ae_page_objects", :path=>"../../../.." +gem "uglifier", ">= 1.3.0" +gem "coffee-rails", "~> 4.0.0" +gem "turbolinks" +gem "jbuilder", "~> 1.2" +gem "capybara", "~> 2.1.0" + diff --git a/test/test_apps/4.0/gemfiles/capybara_2.1_ruby2.0.0.gemfile b/test/test_apps/4.0/gemfiles/capybara_2.1_ruby2.0.0.gemfile new file mode 100644 index 00000000..42d7d033 --- /dev/null +++ b/test/test_apps/4.0/gemfiles/capybara_2.1_ruby2.0.0.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "4.0.4" +gem "sqlite3" +gem "sass-rails", "~> 4.0.2" +gem "jquery-rails" +gem "selenium-webdriver" +gem "mocha", "0.13.3", :require=>false +gem "appraisal", "~> 0.5.1" +gem "ae_page_objects", :path=>"../../../.." +gem "uglifier", ">= 1.3.0" +gem "coffee-rails", "~> 4.0.0" +gem "turbolinks" +gem "jbuilder", "~> 1.2" +gem "capybara", "~> 2.1.0" + diff --git a/test/test_apps/4.0/gemfiles/capybara_2.2_ruby1.9.3.gemfile b/test/test_apps/4.0/gemfiles/capybara_2.2_ruby1.9.3.gemfile new file mode 100644 index 00000000..2813694d --- /dev/null +++ b/test/test_apps/4.0/gemfiles/capybara_2.2_ruby1.9.3.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "4.0.4" +gem "sqlite3" +gem "sass-rails", "~> 4.0.2" +gem "jquery-rails" +gem "selenium-webdriver" +gem "mocha", "0.13.3", :require=>false +gem "appraisal", "~> 0.5.1" +gem "ae_page_objects", :path=>"../../../.." +gem "uglifier", ">= 1.3.0" +gem "coffee-rails", "~> 4.0.0" +gem "turbolinks" +gem "jbuilder", "~> 1.2" +gem "capybara", "~> 2.2.0" + diff --git a/test/test_apps/4.0/gemfiles/capybara_2.2_ruby2.0.0.gemfile b/test/test_apps/4.0/gemfiles/capybara_2.2_ruby2.0.0.gemfile new file mode 100644 index 00000000..2813694d --- /dev/null +++ b/test/test_apps/4.0/gemfiles/capybara_2.2_ruby2.0.0.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "4.0.4" +gem "sqlite3" +gem "sass-rails", "~> 4.0.2" +gem "jquery-rails" +gem "selenium-webdriver" +gem "mocha", "0.13.3", :require=>false +gem "appraisal", "~> 0.5.1" +gem "ae_page_objects", :path=>"../../../.." +gem "uglifier", ">= 1.3.0" +gem "coffee-rails", "~> 4.0.0" +gem "turbolinks" +gem "jbuilder", "~> 1.2" +gem "capybara", "~> 2.2.0" + diff --git a/test/test_apps/4.0/test b/test/test_apps/4.0/test new file mode 120000 index 00000000..99b2d18d --- /dev/null +++ b/test/test_apps/4.0/test @@ -0,0 +1 @@ +../shared/test \ No newline at end of file diff --git a/test/test_apps/4.0/test/controllers/.keep b/test/test_apps/4.0/test/controllers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/test/fixtures/.keep b/test/test_apps/4.0/test/fixtures/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/test/helpers/.keep b/test/test_apps/4.0/test/helpers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/test/integration/.keep b/test/test_apps/4.0/test/integration/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/test/mailers/.keep b/test/test_apps/4.0/test/mailers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/test/models/.keep b/test/test_apps/4.0/test/models/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/test_apps/4.0/test/test_helper.rb b/test/test_apps/4.0/test/test_helper.rb deleted file mode 100644 index bc7e05d7..00000000 --- a/test/test_apps/4.0/test/test_helper.rb +++ /dev/null @@ -1,15 +0,0 @@ -ENV["RAILS_ENV"] ||= "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - ActiveRecord::Migration.check_pending! - - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... -end From df60411155794250861bca1421a099eb9d241c8e Mon Sep 17 00:00:00 2001 From: Donnie Tognazzini Date: Fri, 6 Jun 2014 23:27:02 -0700 Subject: [PATCH 3/3] Update CHANGELOG.md [ci skip] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e25f7d50..f312dd9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## X.X.X + +* Rails 4 support + ## 1.1.0 * Multiple window support: