Skip to content

Commit

Permalink
Now that dependence on strong_parameters is removed, manually bring i…
Browse files Browse the repository at this point in the history
…t into tests.
  • Loading branch information
colinyoung committed Oct 30, 2013
1 parent 27a9229 commit 2cfd756
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
4 changes: 4 additions & 0 deletions 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'
Expand Down
7 changes: 7 additions & 0 deletions cancan_strong_parameters.gemspec
Expand Up @@ -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)/})
Expand Down
10 changes: 6 additions & 4 deletions test/rails_helper.rb
Expand Up @@ -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"
Expand 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
Expand Down

0 comments on commit 2cfd756

Please sign in to comment.