From 2cfd756741b86257a92c67f5c93eb1936a7817b6 Mon Sep 17 00:00:00 2001 From: Colin Young Date: Wed, 30 Oct 2013 17:57:10 -0500 Subject: [PATCH] Now that dependence on strong_parameters is removed, manually bring it into tests. --- Rakefile | 4 ++++ cancan_strong_parameters.gemspec | 7 +++++++ test/rails_helper.rb | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index 37faec1..e3bbcbd 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,10 @@ #!/usr/bin/env rake $: << File.dirname(__FILE__) +require 'rubygems' + +gem 'activesupport', '~> 3.0' + require "bundler/gem_tasks" require 'rake/testtask' require 'test/rails_helper' diff --git a/cancan_strong_parameters.gemspec b/cancan_strong_parameters.gemspec index 3a17fba..bb38f90 100644 --- a/cancan_strong_parameters.gemspec +++ b/cancan_strong_parameters.gemspec @@ -16,6 +16,13 @@ Gem::Specification.new do |gem| gem.add_development_dependency "minitest_tu_shim" gem.add_development_dependency "rails" + # For testing + gem.add_development_dependency "strong_parameters", "0.1.6" + gem.add_development_dependency 'actionpack', '~> 3.0' + gem.add_development_dependency 'activesupport', '~> 3.0' + gem.add_development_dependency 'activemodel', '~> 3.0' + gem.add_development_dependency 'railties', '~> 3.0' + gem.files = `git ls-files`.split($\) gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) } gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) diff --git a/test/rails_helper.rb b/test/rails_helper.rb index 6ddb9d7..352650d 100644 --- a/test/rails_helper.rb +++ b/test/rails_helper.rb @@ -5,10 +5,10 @@ require 'rubygems' -gem 'actionpack', '>= 3.0.0' -gem 'activesupport', '>= 3.0.0' -gem 'activemodel', '>= 3.0.0' -gem 'railties', '>= 3.0.0' +gem 'actionpack', '~> 3.0' +gem 'activemodel', '~> 3.0' +gem 'railties', '~> 3.0' +gem 'strong_parameters', '0.1.6' # Only the parts of rails we want to use # if you want everything, use "rails/all" @@ -17,6 +17,8 @@ require "rails/test_unit/railtie" require "rack/test" +require 'strong_parameters' # when using an ordinary bundle, this wouldn't be required + root = File.expand_path(File.dirname(__FILE__)) # Define the application and configuration