diff options
| author | Philip Arndt <parndt@gmail.com> | 2011-08-14 23:31:15 -0700 |
|---|---|---|
| committer | Philip Arndt <parndt@gmail.com> | 2011-08-14 23:31:15 -0700 |
| commit | eaaa351f3a3d4c447c96ff8f88bc6925dfe45b43 (patch) | |
| tree | 3374d3aafb5eb2b332367edf90455702072395a5 /spec | |
| parent | 87bc12a1e47779fcfa90d24a2eb22862560ca646 (diff) | |
| parent | aed0b8f173534ccaf4f2f09b3e7b705fb0b08c7b (diff) | |
| download | refinerycms-blog-eaaa351f3a3d4c447c96ff8f88bc6925dfe45b43.tar.gz refinerycms-blog-eaaa351f3a3d4c447c96ff8f88bc6925dfe45b43.tar.bz2 refinerycms-blog-eaaa351f3a3d4c447c96ff8f88bc6925dfe45b43.zip | |
Merge pull request #113 from enmasse-entertainment/ruby-187-support
Ruby 187 support
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/dummy/config/application.rb | 7 | ||||
| -rw-r--r-- | spec/dummy/config/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | spec/dummy/config/initializers/wrap_parameters.rb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 60df716..e67cf82 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -3,7 +3,12 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' require 'bundler/setup' -Bundler.require + +# If you have a Gemfile, require the default gems, the ones in the +# current environment and also include :assets gems if in development +# or test environments. +Bundler.require *Rails.groups(:assets) if defined?(Bundler) + require 'refinerycms-blog' module Dummy diff --git a/spec/dummy/config/initializers/session_store.rb b/spec/dummy/config/initializers/session_store.rb index 952473f..aa2f512 100644 --- a/spec/dummy/config/initializers/session_store.rb +++ b/spec/dummy/config/initializers/session_store.rb @@ -1,6 +1,6 @@ # Be sure to restart your server when you modify this file. -Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' +Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information diff --git a/spec/dummy/config/initializers/wrap_parameters.rb b/spec/dummy/config/initializers/wrap_parameters.rb index 16c3243..71b88b0 100644 --- a/spec/dummy/config/initializers/wrap_parameters.rb +++ b/spec/dummy/config/initializers/wrap_parameters.rb @@ -4,7 +4,7 @@ # is enabled by default. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActionController::Base.wrap_parameters format: [:json] +ActionController::Base.wrap_parameters :format => [:json] # Disable root element in JSON by default. if defined?(ActiveRecord) |