Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removing ruby19 hash syntax from RSpec helper and specs to maintain R…

…uby18 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.
  • Loading branch information...
commit fdf85343a82914a975899fa311647fd5c9fb7b28 1 parent 642c296
Ben Atkins batter authored
Showing with 9 additions and 714 deletions.
  1. +1 −3 .gitignore
  2. +3 −0  gemfiles/3.0.gemfile
  3. +1 −1  lib/paper_trail/frameworks/rspec.rb
  4. +0 −6 spec/dummy/Rakefile
  5. 0  spec/dummy/app/assets/images/.keep
  6. +0 −13 spec/dummy/app/assets/javascripts/application.js
  7. +0 −13 spec/dummy/app/assets/stylesheets/application.css
  8. +0 −5 spec/dummy/app/controllers/application_controller.rb
  9. 0  spec/dummy/app/controllers/concerns/.keep
  10. +0 −2  spec/dummy/app/helpers/application_helper.rb
  11. 0  spec/dummy/app/mailers/.keep
  12. 0  spec/dummy/app/models/.keep
  13. 0  spec/dummy/app/models/concerns/.keep
  14. +0 −14 spec/dummy/app/models/widget.rb
  15. +0 −14 spec/dummy/app/views/layouts/application.html.erb
  16. +0 −3  spec/dummy/bin/bundle
  17. +0 −4 spec/dummy/bin/rails
  18. +0 −4 spec/dummy/bin/rake
  19. +0 −4 spec/dummy/config.ru
  20. +0 −50 spec/dummy/config/application.rb
  21. +0 −5 spec/dummy/config/boot.rb
  22. +0 −25 spec/dummy/config/database.yml
  23. +0 −5 spec/dummy/config/environment.rb
  24. +0 −35 spec/dummy/config/environments/development.rb
  25. +0 −80 spec/dummy/config/environments/production.rb
  26. +0 −39 spec/dummy/config/environments/test.rb
  27. +0 −7 spec/dummy/config/initializers/backtrace_silencers.rb
  28. +0 −4 spec/dummy/config/initializers/filter_parameter_logging.rb
  29. +0 −16 spec/dummy/config/initializers/inflections.rb
  30. +0 −5 spec/dummy/config/initializers/mime_types.rb
  31. +0 −12 spec/dummy/config/initializers/secret_token.rb
  32. +0 −3  spec/dummy/config/initializers/session_store.rb
  33. +0 −14 spec/dummy/config/initializers/wrap_parameters.rb
  34. +0 −23 spec/dummy/config/locales/en.yml
  35. +0 −56 spec/dummy/config/routes.rb
  36. +0 −10 spec/dummy/db/migrate/20130827163104_create_widgets.rb
  37. +0 −18 spec/dummy/db/migrate/20130827163507_create_versions.rb
  38. +0 −9 spec/dummy/db/migrate/20130827163508_add_object_changes_column_to_versions.rb
  39. +0 −35 spec/dummy/db/schema.rb
  40. 0  spec/dummy/lib/assets/.keep
  41. 0  spec/dummy/log/.keep
  42. +0 −58 spec/dummy/public/404.html
  43. +0 −58 spec/dummy/public/422.html
  44. +0 −57 spec/dummy/public/500.html
  45. 0  spec/dummy/public/favicon.ico
  46. +2 −2 spec/models/widget_spec.rb
  47. +1 −1  spec/paper_trail_spec.rb
  48. +1 −1  spec/spec_helper.rb
4 .gitignore
View
@@ -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
3  gemfiles/3.0.gemfile
View
@@ -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.
2  lib/paper_trail/frameworks/rspec.rb
View
@@ -10,7 +10,7 @@
::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
6 spec/dummy/Rakefile
View
@@ -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
0  spec/dummy/app/assets/images/.keep
View
No changes.
13 spec/dummy/app/assets/javascripts/application.js
View
@@ -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 .
13 spec/dummy/app/assets/stylesheets/application.css
View
@@ -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 .
- */
5 spec/dummy/app/controllers/application_controller.rb
View
@@ -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
0  spec/dummy/app/controllers/concerns/.keep
View
No changes.
2  spec/dummy/app/helpers/application_helper.rb
View
@@ -1,2 +0,0 @@
-module ApplicationHelper
-end
0  spec/dummy/app/mailers/.keep
View
No changes.
0  spec/dummy/app/models/.keep
View
No changes.
0  spec/dummy/app/models/concerns/.keep
View
No changes.
14 spec/dummy/app/models/widget.rb
View
@@ -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
14 spec/dummy/app/views/layouts/application.html.erb
View
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Dummy</title>
- <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
- <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
- <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
3  spec/dummy/bin/bundle
View
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
4 spec/dummy/bin/rails
View
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
4 spec/dummy/bin/rake
View
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run
4 spec/dummy/config.ru
View
@@ -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
50 spec/dummy/config/application.rb
View
@@ -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
-
5 spec/dummy/config/boot.rb
View
@@ -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__)
25 spec/dummy/config/database.yml
View
@@ -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
5 spec/dummy/config/environment.rb
View
@@ -1,5 +0,0 @@
-# Load the Rails application.
-require File.expand_path('../application', __FILE__)
-
-# Initialize the Rails application.
-Dummy::Application.initialize!
35 spec/dummy/config/environments/development.rb
View
@@ -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
80 spec/dummy/config/environments/production.rb
View
@@ -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
39 spec/dummy/config/environments/test.rb
View
@@ -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
7 spec/dummy/config/initializers/backtrace_silencers.rb
View
@@ -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!
4 spec/dummy/config/initializers/filter_parameter_logging.rb
View
@@ -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]
16 spec/dummy/config/initializers/inflections.rb
View
@@ -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
5 spec/dummy/config/initializers/mime_types.rb
View
@@ -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
12 spec/dummy/config/initializers/secret_token.rb
View
@@ -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'
3  spec/dummy/config/initializers/session_store.rb
View
@@ -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'
14 spec/dummy/config/initializers/wrap_parameters.rb
View
@@ -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
23 spec/dummy/config/locales/en.yml
View
@@ -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"
56 spec/dummy/config/routes.rb
View
@@ -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
10 spec/dummy/db/migrate/20130827163104_create_widgets.rb
View
@@ -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
18 spec/dummy/db/migrate/20130827163507_create_versions.rb
View
@@ -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
9 spec/dummy/db/migrate/20130827163508_add_object_changes_column_to_versions.rb
View
@@ -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
35 spec/dummy/db/schema.rb
View
@@ -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
0  spec/dummy/lib/assets/.keep
View
No changes.
0  spec/dummy/log/.keep
View
No changes.
58 spec/dummy/public/404.html
View
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>The page you were looking for doesn't exist (404)</title>
- <style>
- body {
- background-color: #EFEFEF;
- color: #2E2F30;
- text-align: center;
- font-family: arial, sans-serif;
- }
-
- div.dialog {
- width: 25em;
- margin: 4em auto 0 auto;
- border: 1px solid #CCC;
- border-right-color: #999;
- border-left-color: #999;
- border-bottom-color: #BBB;
- border-top: #B00100 solid 4px;
- border-top-left-radius: 9px;
- border-top-right-radius: 9px;
- background-color: white;
- padding: 7px 4em 0 4em;
- }
-
- h1 {
- font-size: 100%;
- color: #730E15;
- line-height: 1.5em;
- }
-
- body > p {
- width: 33em;
- margin: 0 auto 1em;
- padding: 1em 0;
- background-color: #F7F7F7;
- border: 1px solid #CCC;
- border-right-color: #999;
- border-bottom-color: #999;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-color: #DADADA;
- color: #666;
- box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
- }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/404.html -->
- <div class="dialog">
- <h1>The page you were looking for doesn't exist.</h1>
- <p>You may have mistyped the address or the page may have moved.</p>
- </div>
- <p>If you are the application owner check the logs for more information.</p>
-</body>
-</html>
58 spec/dummy/public/422.html
View
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>The change you wanted was rejected (422)</title>
- <style>
- body {
- background-color: #EFEFEF;
- color: #2E2F30;
- text-align: center;
- font-family: arial, sans-serif;
- }
-
- div.dialog {
- width: 25em;
- margin: 4em auto 0 auto;
- border: 1px solid #CCC;
- border-right-color: #999;
- border-left-color: #999;
- border-bottom-color: #BBB;
- border-top: #B00100 solid 4px;
- border-top-left-radius: 9px;
- border-top-right-radius: 9px;
- background-color: white;
- padding: 7px 4em 0 4em;
- }
-
- h1 {
- font-size: 100%;
- color: #730E15;
- line-height: 1.5em;
- }
-
- body > p {
- width: 33em;
- margin: 0 auto 1em;
- padding: 1em 0;
- background-color: #F7F7F7;
- border: 1px solid #CCC;
- border-right-color: #999;
- border-bottom-color: #999;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-color: #DADADA;
- color: #666;
- box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
- }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/422.html -->
- <div class="dialog">
- <h1>The change you wanted was rejected.</h1>
- <p>Maybe you tried to change something you didn't have access to.</p>
- </div>
- <p>If you are the application owner check the logs for more information.</p>
-</body>
-</html>
57 spec/dummy/public/500.html
View
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>We're sorry, but something went wrong (500)</title>
- <style>
- body {
- background-color: #EFEFEF;
- color: #2E2F30;
- text-align: center;
- font-family: arial, sans-serif;
- }
-
- div.dialog {
- width: 25em;
- margin: 4em auto 0 auto;
- border: 1px solid #CCC;
- border-right-color: #999;
- border-left-color: #999;
- border-bottom-color: #BBB;
- border-top: #B00100 solid 4px;
- border-top-left-radius: 9px;
- border-top-right-radius: 9px;
- background-color: white;
- padding: 7px 4em 0 4em;
- }
-
- h1 {
- font-size: 100%;
- color: #730E15;
- line-height: 1.5em;
- }
-
- body > p {
- width: 33em;
- margin: 0 auto 1em;
- padding: 1em 0;
- background-color: #F7F7F7;
- border: 1px solid #CCC;
- border-right-color: #999;
- border-bottom-color: #999;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
- border-top-color: #DADADA;
- color: #666;
- box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
- }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/500.html -->
- <div class="dialog">
- <h1>We're sorry, but something went wrong.</h1>
- </div>
- <p>If you are the application owner check the logs for more information.</p>
-</body>
-</html>
0  spec/dummy/public/favicon.ico
View
No changes.
4 spec/models/widget_spec.rb
View
@@ -3,9 +3,9 @@
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
2  spec/paper_trail_spec.rb
View
@@ -15,7 +15,7 @@
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
2  spec/spec_helper.rb
View
@@ -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'
Please sign in to comment.
Something went wrong with that request. Please try again.