Skip to content

Commit

Permalink
removed all staled dependencies constraints.
Browse files Browse the repository at this point in the history
Cancan => cannot with filter does not work with latest release of Cancan (bug report pending), workaround meanwhile.
  • Loading branch information
bbenezech committed Aug 27, 2012
1 parent 3c83b27 commit 69463df
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -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
8 changes: 4 additions & 4 deletions rails_admin.gemspec
Expand Up @@ -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'
Expand All @@ -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"]
Expand Down
6 changes: 4 additions & 2 deletions spec/dummy_app/Gemfile
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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

Expand Down
5 changes: 3 additions & 2 deletions spec/integration/authorization/cancan_spec.rb
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 69463df

Please sign in to comment.