Permalink
Browse files

removed all staled dependencies constraints.

Cancan => cannot with filter does not work with latest release of Cancan (bug report pending), workaround meanwhile.
  • Loading branch information...
1 parent 3c83b27 commit 69463df026e2c52eb9622721dd1e022ff5a646d4 @bbenezech bbenezech committed Aug 27, 2012
Showing with 13 additions and 10 deletions.
  1. +2 −2 Gemfile
  2. +4 −4 rails_admin.gemspec
  3. +4 −2 spec/dummy_app/Gemfile
  4. +3 −2 spec/integration/authorization/cancan_spec.rb
View
@@ -72,9 +72,9 @@ platforms :jruby, :mingw_18, :ruby_18 do
end
group :development, :test do
- gem 'cancan', '1.6.7'
+ gem 'cancan'
gem 'devise'
- gem 'paperclip', '~> 2.7'
+ gem 'paperclip'
end
gemspec
View
@@ -5,8 +5,8 @@ Gem::Specification.new do |gem|
# If you add a dependency, please maintain alphabetical order
gem.add_dependency 'bbenezech-nested_form', '~> 0.0.6'
gem.add_dependency 'sass-rails', '~> 3.1'
- gem.add_dependency 'bootstrap-sass', ['~> 2.0', '>= 2.0.3']
- gem.add_dependency 'jquery-ui-rails', ['>= 0.5', '< 2']
+ gem.add_dependency 'bootstrap-sass', ['~> 2.0.3']
+ gem.add_dependency 'jquery-ui-rails', ['>= 0.5']
gem.add_dependency 'builder', '~> 3.0'
gem.add_dependency 'coffee-rails', '~> 3.1'
gem.add_dependency 'haml', '~> 3.1'
@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'database_cleaner', '~> 0.8'
gem.add_development_dependency 'devise'
gem.add_development_dependency 'dragonfly'
- gem.add_development_dependency 'factory_girl', '~> 2.6'
+ gem.add_development_dependency 'factory_girl'
gem.add_development_dependency 'generator_spec'
gem.add_development_dependency 'launchy'
gem.add_development_dependency 'mini_magick'
- gem.add_development_dependency 'paperclip', '~> 2.7'
+ gem.add_development_dependency 'paperclip'
gem.add_development_dependency 'rspec-rails'
gem.add_development_dependency 'timecop'
gem.authors = ["Erik Michaels-Ober", "Bogdan Gaza", "Petteri Kaapa", "Benoit Benezech"]
View
@@ -2,6 +2,8 @@ source 'https://rubygems.org'
gem 'rails', '~> 3.2'
+gem 'cancan'
+
group :active_record do
platforms :jruby do
gem 'jruby-openssl', '~> 0.7'
@@ -28,7 +30,7 @@ group :active_record do
gem 'sqlite3', '~> 1.3'
end
end
- gem 'paperclip', '~> 2.7'
+ gem 'paperclip'
gem 'carrierwave'
gem 'dragonfly'
end
@@ -51,7 +53,7 @@ group :mongoid do
gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
end
- gem 'paperclip', '~> 2.7'
+ gem 'paperclip'
gem 'dragonfly'
end
@@ -18,7 +18,8 @@ def initialize(user)
can :access, :rails_admin
can :manage, :all
can :show_in_app, :all
- cannot [:update, :destroy], Player, :retired => true
+ cannot [:update, :destroy], Player
+ can [:update, :destroy], Player, :retired => false
end
end
end
@@ -291,7 +292,7 @@ def initialize(user)
retired_player = FactoryGirl.create :player, :retired => true
page.driver.post(bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => [active_player, retired_player].map(&:id)))
-
+
should have_content(active_player.name)
should_not have_content(retired_player.name)
end

0 comments on commit 69463df

Please sign in to comment.