From fdf85343a82914a975899fa311647fd5c9fb7b28 Mon Sep 17 00:00:00 2001 From: Ben Atkins Date: Tue, 27 Aug 2013 17:00:06 -0400 Subject: [PATCH] Removing ruby19 hash syntax from RSpec helper and specs to maintain Ruby18 compatibility. Changing the spec_helper to use the dummy app in the 'test' directory to avoid having two dummy apps. Adding 'rspec-rails' to the 3.0.gemfile so it can run the spec tests on Travis. --- .gitignore | 4 +- gemfiles/3.0.gemfile | 3 + lib/paper_trail/frameworks/rspec.rb | 2 +- spec/dummy/Rakefile | 6 -- spec/dummy/app/assets/images/.keep | 0 .../app/assets/javascripts/application.js | 13 --- .../app/assets/stylesheets/application.css | 13 --- .../app/controllers/application_controller.rb | 5 -- spec/dummy/app/controllers/concerns/.keep | 0 spec/dummy/app/helpers/application_helper.rb | 2 - spec/dummy/app/mailers/.keep | 0 spec/dummy/app/models/.keep | 0 spec/dummy/app/models/concerns/.keep | 0 spec/dummy/app/models/widget.rb | 14 ---- .../app/views/layouts/application.html.erb | 14 ---- spec/dummy/bin/bundle | 3 - spec/dummy/bin/rails | 4 - spec/dummy/bin/rake | 4 - spec/dummy/config.ru | 4 - spec/dummy/config/application.rb | 50 ------------ spec/dummy/config/boot.rb | 5 -- spec/dummy/config/database.yml | 25 ------ spec/dummy/config/environment.rb | 5 -- spec/dummy/config/environments/development.rb | 35 -------- spec/dummy/config/environments/production.rb | 80 ------------------- spec/dummy/config/environments/test.rb | 39 --------- .../initializers/backtrace_silencers.rb | 7 -- .../initializers/filter_parameter_logging.rb | 4 - spec/dummy/config/initializers/inflections.rb | 16 ---- spec/dummy/config/initializers/mime_types.rb | 5 -- .../dummy/config/initializers/secret_token.rb | 12 --- .../config/initializers/session_store.rb | 3 - .../config/initializers/wrap_parameters.rb | 14 ---- spec/dummy/config/locales/en.yml | 23 ------ spec/dummy/config/routes.rb | 56 ------------- .../migrate/20130827163104_create_widgets.rb | 10 --- .../migrate/20130827163507_create_versions.rb | 18 ----- ...8_add_object_changes_column_to_versions.rb | 9 --- spec/dummy/db/schema.rb | 35 -------- spec/dummy/lib/assets/.keep | 0 spec/dummy/log/.keep | 0 spec/dummy/public/404.html | 58 -------------- spec/dummy/public/422.html | 58 -------------- spec/dummy/public/500.html | 57 ------------- spec/dummy/public/favicon.ico | 0 spec/models/widget_spec.rb | 4 +- spec/paper_trail_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 48 files changed, 9 insertions(+), 714 deletions(-) delete mode 100644 spec/dummy/Rakefile delete mode 100644 spec/dummy/app/assets/images/.keep delete mode 100644 spec/dummy/app/assets/javascripts/application.js delete mode 100644 spec/dummy/app/assets/stylesheets/application.css delete mode 100644 spec/dummy/app/controllers/application_controller.rb delete mode 100644 spec/dummy/app/controllers/concerns/.keep delete mode 100644 spec/dummy/app/helpers/application_helper.rb delete mode 100644 spec/dummy/app/mailers/.keep delete mode 100644 spec/dummy/app/models/.keep delete mode 100644 spec/dummy/app/models/concerns/.keep delete mode 100644 spec/dummy/app/models/widget.rb delete mode 100644 spec/dummy/app/views/layouts/application.html.erb delete mode 100755 spec/dummy/bin/bundle delete mode 100755 spec/dummy/bin/rails delete mode 100755 spec/dummy/bin/rake delete mode 100644 spec/dummy/config.ru delete mode 100644 spec/dummy/config/application.rb delete mode 100644 spec/dummy/config/boot.rb delete mode 100644 spec/dummy/config/database.yml delete mode 100644 spec/dummy/config/environment.rb delete mode 100644 spec/dummy/config/environments/development.rb delete mode 100644 spec/dummy/config/environments/production.rb delete mode 100644 spec/dummy/config/environments/test.rb delete mode 100644 spec/dummy/config/initializers/backtrace_silencers.rb delete mode 100644 spec/dummy/config/initializers/filter_parameter_logging.rb delete mode 100644 spec/dummy/config/initializers/inflections.rb delete mode 100644 spec/dummy/config/initializers/mime_types.rb delete mode 100644 spec/dummy/config/initializers/secret_token.rb delete mode 100644 spec/dummy/config/initializers/session_store.rb delete mode 100644 spec/dummy/config/initializers/wrap_parameters.rb delete mode 100644 spec/dummy/config/locales/en.yml delete mode 100644 spec/dummy/config/routes.rb delete mode 100644 spec/dummy/db/migrate/20130827163104_create_widgets.rb delete mode 100644 spec/dummy/db/migrate/20130827163507_create_versions.rb delete mode 100644 spec/dummy/db/migrate/20130827163508_add_object_changes_column_to_versions.rb delete mode 100644 spec/dummy/db/schema.rb delete mode 100644 spec/dummy/lib/assets/.keep delete mode 100644 spec/dummy/log/.keep delete mode 100644 spec/dummy/public/404.html delete mode 100644 spec/dummy/public/422.html delete mode 100644 spec/dummy/public/500.html delete mode 100644 spec/dummy/public/favicon.ico diff --git a/.gitignore b/.gitignore index cb9bd5dc..2ee48aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,7 @@ test/paper_trail_plugin.sqlite3.db test/dummy/db/*.sqlite3 test/dummy/log/* test/dummy/tmp/* -spec/dummy/db/*.sqlite3 -spec/dummy/log/*.log -spec/dummy/tmp +spec/dummy/ coverage pkg/* *.gem diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile index 17d23354..6f2f0811 100644 --- a/gemfiles/3.0.gemfile +++ b/gemfiles/3.0.gemfile @@ -17,6 +17,9 @@ group :development, :test do # Use sqlite3 gem for regular Ruby gem 'sqlite3', '~> 1.2', :platform => :ruby + # RSpec testing + gem 'rspec-rails', '~> 2.14' + platforms :jruby, :ruby_18 do # shoulda-matchers > 2.0 is not compatible with Ruby18. # Since we can't specify difference between JRuby 18/19, we need to use shoulda-matchers 1.5 for all JRuby testing. diff --git a/lib/paper_trail/frameworks/rspec.rb b/lib/paper_trail/frameworks/rspec.rb index a3a17e87..51817de6 100644 --- a/lib/paper_trail/frameworks/rspec.rb +++ b/lib/paper_trail/frameworks/rspec.rb @@ -10,7 +10,7 @@ if defined? RSpec ::PaperTrail.controller_info = {} if defined?(::Rails) && defined?(::RSpec::Rails) end - config.before(:each, versioning: true) do + config.before(:each, :versioning => true) do ::PaperTrail.enabled = true end end diff --git a/spec/dummy/Rakefile b/spec/dummy/Rakefile deleted file mode 100644 index 4135d7a4..00000000 --- a/spec/dummy/Rakefile +++ /dev/null @@ -1,6 +0,0 @@ -# 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__) - -Dummy::Application.load_tasks diff --git a/spec/dummy/app/assets/images/.keep b/spec/dummy/app/assets/images/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/assets/javascripts/application.js b/spec/dummy/app/assets/javascripts/application.js deleted file mode 100644 index 5bc2e1c8..00000000 --- a/spec/dummy/app/assets/javascripts/application.js +++ /dev/null @@ -1,13 +0,0 @@ -// 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_tree . diff --git a/spec/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css deleted file mode 100644 index 3192ec89..00000000 --- a/spec/dummy/app/assets/stylesheets/application.css +++ /dev/null @@ -1,13 +0,0 @@ -/* - * 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/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb deleted file mode 100644 index d83690e1..00000000 --- a/spec/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -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/spec/dummy/app/controllers/concerns/.keep b/spec/dummy/app/controllers/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/helpers/application_helper.rb b/spec/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/spec/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/spec/dummy/app/mailers/.keep b/spec/dummy/app/mailers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/models/.keep b/spec/dummy/app/models/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/models/concerns/.keep b/spec/dummy/app/models/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/models/widget.rb b/spec/dummy/app/models/widget.rb deleted file mode 100644 index 0d2b2cb8..00000000 --- a/spec/dummy/app/models/widget.rb +++ /dev/null @@ -1,14 +0,0 @@ -# == Schema Information -# -# Table name: widgets -# -# id :integer not null, primary key -# name :string(255) -# an_integer :integer -# created_at :datetime not null -# updated_at :datetime not null -# - -class Widget < ActiveRecord::Base - has_paper_trail -end diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb deleted file mode 100644 index 670d1875..00000000 --- a/spec/dummy/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Dummy - <%= 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/spec/dummy/bin/bundle b/spec/dummy/bin/bundle deleted file mode 100755 index 66e9889e..00000000 --- a/spec/dummy/bin/bundle +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -load Gem.bin_path('bundler', 'bundle') diff --git a/spec/dummy/bin/rails b/spec/dummy/bin/rails deleted file mode 100755 index 728cd85a..00000000 --- a/spec/dummy/bin/rails +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -APP_PATH = File.expand_path('../../config/application', __FILE__) -require_relative '../config/boot' -require 'rails/commands' diff --git a/spec/dummy/bin/rake b/spec/dummy/bin/rake deleted file mode 100755 index 17240489..00000000 --- a/spec/dummy/bin/rake +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' -Rake.application.run diff --git a/spec/dummy/config.ru b/spec/dummy/config.ru deleted file mode 100644 index 5bc2a619..00000000 --- a/spec/dummy/config.ru +++ /dev/null @@ -1,4 +0,0 @@ -# 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/spec/dummy/config/application.rb b/spec/dummy/config/application.rb deleted file mode 100644 index 68a8ffd4..00000000 --- a/spec/dummy/config/application.rb +++ /dev/null @@ -1,50 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -# Pick the frameworks you want: -require "active_record/railtie" -require "action_controller/railtie" -# require "sprockets/railtie" - -Bundler.require(:default, Rails.env) if defined?(Bundler) -require 'paper_trail' - -module Dummy - 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 - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Enable escaping HTML in JSON. - config.active_support.escape_html_entities_in_json = true - - # Enforce whitelist mode for mass assignment. - # This will create an empty whitelist of attributes available for mass-assignment for all models - # in your app. As such, your models will need to explicitly whitelist or blacklist accessible - # parameters by using an attr_accessible or attr_protected declaration. - config.active_record.whitelist_attributes = false if ::PaperTrail.active_record_protected_attributes? - - # Enable the asset pipeline - config.assets.enabled = false - - # Version of your assets, change this if you want to expire all your assets - # config.assets.version = '1.0' - - # Rails 4 key for generating secret key - config.secret_key_base = 'A fox regularly kicked the screaming pile of biscuits.' - end -end - diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb deleted file mode 100644 index ef360470..00000000 --- a/spec/dummy/config/boot.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) -$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__) diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml deleted file mode 100644 index 51a4dd45..00000000 --- a/spec/dummy/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# 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/spec/dummy/config/environment.rb b/spec/dummy/config/environment.rb deleted file mode 100644 index 10e0cadc..00000000 --- a/spec/dummy/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require File.expand_path('../application', __FILE__) - -# Initialize the Rails application. -Dummy::Application.initialize! diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb deleted file mode 100644 index dbb36c4e..00000000 --- a/spec/dummy/config/environments/development.rb +++ /dev/null @@ -1,35 +0,0 @@ -Dummy::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 - - # Do not compress assets - config.assets.compress = false - - # 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 - - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict if ::PaperTrail.active_record_protected_attributes? -end diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb deleted file mode 100644 index b690b1cf..00000000 --- a/spec/dummy/config/environments/production.rb +++ /dev/null @@ -1,80 +0,0 @@ -Dummy::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/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb deleted file mode 100644 index fb213f36..00000000 --- a/spec/dummy/config/environments/test.rb +++ /dev/null @@ -1,39 +0,0 @@ -Dummy::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 - - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict if ::PaperTrail.active_record_protected_attributes? - - # Print deprecation notices to the stderr. - config.active_support.deprecation = :stderr -end diff --git a/spec/dummy/config/initializers/backtrace_silencers.rb b/spec/dummy/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/spec/dummy/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# 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/spec/dummy/config/initializers/filter_parameter_logging.rb b/spec/dummy/config/initializers/filter_parameter_logging.rb deleted file mode 100644 index 4a994e1e..00000000 --- a/spec/dummy/config/initializers/filter_parameter_logging.rb +++ /dev/null @@ -1,4 +0,0 @@ -# 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/spec/dummy/config/initializers/inflections.rb b/spec/dummy/config/initializers/inflections.rb deleted file mode 100644 index ac033bf9..00000000 --- a/spec/dummy/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# 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/spec/dummy/config/initializers/mime_types.rb b/spec/dummy/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/spec/dummy/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# 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/spec/dummy/config/initializers/secret_token.rb b/spec/dummy/config/initializers/secret_token.rb deleted file mode 100644 index c4c97be2..00000000 --- a/spec/dummy/config/initializers/secret_token.rb +++ /dev/null @@ -1,12 +0,0 @@ -# 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. -Dummy::Application.config.secret_key_base = 'de278272f6365ccdbf64029944b07ea6db7e36820ae5e6678c313eddb4a62bd59299599d38d56ff988d85ec01c508e1541a5d76cb978b4a23f6c6afcbe16ff61' diff --git a/spec/dummy/config/initializers/session_store.rb b/spec/dummy/config/initializers/session_store.rb deleted file mode 100644 index 155f7b02..00000000 --- a/spec/dummy/config/initializers/session_store.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' diff --git a/spec/dummy/config/initializers/wrap_parameters.rb b/spec/dummy/config/initializers/wrap_parameters.rb deleted file mode 100644 index 33725e95..00000000 --- a/spec/dummy/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# 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/spec/dummy/config/locales/en.yml b/spec/dummy/config/locales/en.yml deleted file mode 100644 index 06539571..00000000 --- a/spec/dummy/config/locales/en.yml +++ /dev/null @@ -1,23 +0,0 @@ -# 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/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb deleted file mode 100644 index 76dbac30..00000000 --- a/spec/dummy/config/routes.rb +++ /dev/null @@ -1,56 +0,0 @@ -Dummy::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/spec/dummy/db/migrate/20130827163104_create_widgets.rb b/spec/dummy/db/migrate/20130827163104_create_widgets.rb deleted file mode 100644 index 3f50ed73..00000000 --- a/spec/dummy/db/migrate/20130827163104_create_widgets.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateWidgets < ActiveRecord::Migration - def change - create_table :widgets do |t| - t.string :name - t.integer :an_integer - - t.timestamps - end - end -end diff --git a/spec/dummy/db/migrate/20130827163507_create_versions.rb b/spec/dummy/db/migrate/20130827163507_create_versions.rb deleted file mode 100644 index 701f7ea7..00000000 --- a/spec/dummy/db/migrate/20130827163507_create_versions.rb +++ /dev/null @@ -1,18 +0,0 @@ -class CreateVersions < ActiveRecord::Migration - def self.up - create_table :versions do |t| - t.string :item_type, :null => false - t.integer :item_id, :null => false - t.string :event, :null => false - t.string :whodunnit - t.text :object - t.datetime :created_at - end - add_index :versions, [:item_type, :item_id] - end - - def self.down - remove_index :versions, [:item_type, :item_id] - drop_table :versions - end -end diff --git a/spec/dummy/db/migrate/20130827163508_add_object_changes_column_to_versions.rb b/spec/dummy/db/migrate/20130827163508_add_object_changes_column_to_versions.rb deleted file mode 100644 index f4674c48..00000000 --- a/spec/dummy/db/migrate/20130827163508_add_object_changes_column_to_versions.rb +++ /dev/null @@ -1,9 +0,0 @@ -class AddObjectChangesColumnToVersions < ActiveRecord::Migration - def self.up - add_column :versions, :object_changes, :text - end - - def self.down - remove_column :versions, :object_changes - end -end diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb deleted file mode 100644 index db342c52..00000000 --- a/spec/dummy/db/schema.rb +++ /dev/null @@ -1,35 +0,0 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 20130827163508) do - - create_table "versions", force: true do |t| - t.string "item_type", null: false - t.integer "item_id", null: false - t.string "event", null: false - t.string "whodunnit" - t.text "object" - t.datetime "created_at" - t.text "object_changes" - end - - add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id" - - create_table "widgets", force: true do |t| - t.string "name" - t.integer "an_integer" - t.datetime "created_at" - t.datetime "updated_at" - end - -end diff --git a/spec/dummy/lib/assets/.keep b/spec/dummy/lib/assets/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/log/.keep b/spec/dummy/log/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/public/404.html b/spec/dummy/public/404.html deleted file mode 100644 index a0daa0c1..00000000 --- a/spec/dummy/public/404.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - 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/spec/dummy/public/422.html b/spec/dummy/public/422.html deleted file mode 100644 index fbb4b84d..00000000 --- a/spec/dummy/public/422.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - 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/spec/dummy/public/500.html b/spec/dummy/public/500.html deleted file mode 100644 index e9052d35..00000000 --- a/spec/dummy/public/500.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - 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/spec/dummy/public/favicon.ico b/spec/dummy/public/favicon.ico deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/models/widget_spec.rb b/spec/models/widget_spec.rb index 2a91018d..4ba6e776 100644 --- a/spec/models/widget_spec.rb +++ b/spec/models/widget_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' describe Widget do it { should be_versioned } - context 'be_versioned matcher', versioning: true do + context 'be_versioned matcher', :versioning => true do it 'should respond to be_versioned' do - widget = Widget.create name: 'Bob', an_integer: 1 + widget = Widget.create :name => 'Bob', :an_integer => 1 widget.should be_versioned widget.versions.size.should == 1 end diff --git a/spec/paper_trail_spec.rb b/spec/paper_trail_spec.rb index ffb5b701..70aa5052 100644 --- a/spec/paper_trail_spec.rb +++ b/spec/paper_trail_spec.rb @@ -15,7 +15,7 @@ describe "PaperTrail RSpec Helper" do end end - context 'versioning: true', versioning: true do + context 'versioning: true', :versioning => true do it 'should have versioning on by default' do ::PaperTrail.should be_enabled end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6777073e..82303784 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ ENV["RAILS_ENV"] ||= 'test' -require File.expand_path('../dummy/config/environment', __FILE__) +require File.expand_path('../../test/dummy/config/environment', __FILE__) require 'rspec/rails' require 'rspec/autorun'