Skip to content
This repository
Browse code

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...
commit 69463df026e2c52eb9622721dd1e022ff5a646d4 1 parent 3c83b27
Benoit Bénézech authored
4  Gemfile
@@ -72,9 +72,9 @@ platforms :jruby, :mingw_18, :ruby_18 do
72 72
 end
73 73
 
74 74
 group :development, :test do
75  
-  gem 'cancan', '1.6.7'
  75
+  gem 'cancan'
76 76
   gem 'devise'
77  
-  gem 'paperclip', '~> 2.7'
  77
+  gem 'paperclip'
78 78
 end
79 79
 
80 80
 gemspec
8  rails_admin.gemspec
@@ -5,8 +5,8 @@ Gem::Specification.new do |gem|
5 5
   # If you add a dependency, please maintain alphabetical order
6 6
   gem.add_dependency 'bbenezech-nested_form', '~> 0.0.6'
7 7
   gem.add_dependency 'sass-rails', '~> 3.1'
8  
-  gem.add_dependency 'bootstrap-sass', ['~> 2.0', '>= 2.0.3']
9  
-  gem.add_dependency 'jquery-ui-rails', ['>= 0.5', '< 2']
  8
+  gem.add_dependency 'bootstrap-sass', ['~> 2.0.3']
  9
+  gem.add_dependency 'jquery-ui-rails', ['>= 0.5']
10 10
   gem.add_dependency 'builder', '~> 3.0'
11 11
   gem.add_dependency 'coffee-rails', '~> 3.1'
12 12
   gem.add_dependency 'haml', '~> 3.1'
@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
21 21
   gem.add_development_dependency 'database_cleaner', '~> 0.8'
22 22
   gem.add_development_dependency 'devise'
23 23
   gem.add_development_dependency 'dragonfly'
24  
-  gem.add_development_dependency 'factory_girl', '~> 2.6'
  24
+  gem.add_development_dependency 'factory_girl'
25 25
   gem.add_development_dependency 'generator_spec'
26 26
   gem.add_development_dependency 'launchy'
27 27
   gem.add_development_dependency 'mini_magick'
28  
-  gem.add_development_dependency 'paperclip', '~> 2.7'
  28
+  gem.add_development_dependency 'paperclip'
29 29
   gem.add_development_dependency 'rspec-rails'
30 30
   gem.add_development_dependency 'timecop'
31 31
   gem.authors = ["Erik Michaels-Ober", "Bogdan Gaza", "Petteri Kaapa", "Benoit Benezech"]
6  spec/dummy_app/Gemfile
@@ -2,6 +2,8 @@ source 'https://rubygems.org'
2 2
 
3 3
 gem 'rails', '~> 3.2'
4 4
 
  5
+gem 'cancan'
  6
+
5 7
 group :active_record do
6 8
   platforms :jruby do
7 9
     gem 'jruby-openssl', '~> 0.7'
@@ -28,7 +30,7 @@ group :active_record do
28 30
       gem 'sqlite3', '~> 1.3'
29 31
     end
30 32
   end
31  
-  gem 'paperclip', '~> 2.7'
  33
+  gem 'paperclip'
32 34
   gem 'carrierwave'
33 35
   gem 'dragonfly'
34 36
 end
@@ -51,7 +53,7 @@ group :mongoid do
51 53
     gem 'mongoid-paperclip', :require => 'mongoid_paperclip', :git => 'git://github.com/meskyanichi/mongoid-paperclip.git', :branch => 'develop'
52 54
     gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid', :git => 'git://github.com/jnicklas/carrierwave-mongoid.git', :branch => 'mongoid-3.0'
53 55
   end
54  
-  gem 'paperclip', '~> 2.7'
  56
+  gem 'paperclip'
55 57
   gem 'dragonfly'
56 58
 end
57 59
 
5  spec/integration/authorization/cancan_spec.rb
@@ -18,7 +18,8 @@ def initialize(user)
18 18
       can :access, :rails_admin
19 19
       can :manage, :all
20 20
       can :show_in_app, :all
21  
-      cannot [:update, :destroy], Player, :retired => true
  21
+      cannot [:update, :destroy], Player
  22
+      can [:update, :destroy], Player, :retired => false
22 23
     end
23 24
   end
24 25
 end
@@ -291,7 +292,7 @@ def initialize(user)
291 292
       retired_player = FactoryGirl.create :player, :retired => true
292 293
 
293 294
       page.driver.post(bulk_action_path(:bulk_action => 'bulk_delete', :model_name => "player", :bulk_ids => [active_player, retired_player].map(&:id)))
294  
-
  295
+      
295 296
       should have_content(active_player.name)
296 297
       should_not have_content(retired_player.name)
297 298
     end

0 notes on commit 69463df

Please sign in to comment.
Something went wrong with that request. Please try again.