Revert "upgrade devise; devise_invitable"

This reverts commit 0f56ee7.
geraspora · Dec 6, 2011 · d0f58e1 · d0f58e1
1 parent 0f56ee7
commit d0f58e1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,8 +9,8 @@ gem 'thin', '~> 1.3.1', :require => false
 
 # authentication
 
-gem 'devise', '~> 1.5.0'
-gem 'devise_invitable', '~> 0.6.0'
+gem 'devise', '~> 1.3.1'
+gem 'devise_invitable', '0.5.0'
 gem 'jwt', "0.1.3"
 gem 'oauth2-provider', '0.0.16'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -88,7 +88,7 @@ GEM
     addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
-    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
     bunny (0.7.8)
     capistrano (2.5.19)
@@ -145,13 +145,13 @@ GEM
     culerity (0.2.15)
     daemons (1.1.4)
     database_cleaner (0.7.0)
-    devise (1.5.2)
-      bcrypt-ruby (~> 3.0)
+    devise (1.3.4)
+      bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    devise_invitable (0.6.0)
-      devise (>= 1.4.6, < 1.6)
-      rails (>= 3.0.0, < 3.2)
+      warden (~> 1.0.3)
+    devise_invitable (0.5.0)
+      devise (~> 1.3.1)
+      rails (>= 3.0.0, <= 3.2)
     diff-lcs (1.1.3)
     em-synchrony (0.2.0)
       eventmachine (>= 0.12.9)
@@ -286,7 +286,7 @@ GEM
       omniauth-oauth (~> 1.0)
     open4 (1.3.0)
     orm_adapter (0.0.5)
-    parallel (0.5.10)
+    parallel (0.5.9)
     parallel_tests (0.6.11)
       parallel
     polyglot (0.3.3)
@@ -399,7 +399,7 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.8)
       rack (>= 1.0.0)
-    warden (1.1.0)
+    warden (1.0.6)
       rack (>= 1.0)
     webmock (1.6.2)
       addressable (>= 2.2.2)
@@ -429,8 +429,8 @@ DEPENDENCIES
   cucumber-api-steps (= 0.6)
   cucumber-rails (= 0.3.2)
   database_cleaner (= 0.7.0)
-  devise (~> 1.5.0)
-  devise_invitable (~> 0.6.0)
+  devise (~> 1.3.1)
+  devise_invitable (= 0.5.0)
   diaspora-client!
   em-synchrony
   em-websocket

diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
@@ -22,7 +22,7 @@ def create
     emails = params[:user][:email].to_s.gsub(/\s/, '').split(/, */)
     #NOTE should we try and find users by email here? probs
     aspect = current_user.aspects.find(aspect_id)
-
+    
     language = params[:user][:language]
 
     invites = Invitation.batch_invite(emails, :message => message, :sender => current_user, :aspect => aspect, :service => 'email', :language => language)

diff --git a/spec/models/invitation_spec.rb b/spec/models/invitation_spec.rb
@@ -72,8 +72,7 @@
       invite = Invitation.create(:sender => alice, :aspect => alice.aspects.first, :service => 'facebook', :identifier => bob.services.first.uid)
       lambda {
         invite.send!
-      #}.should_not change(User, :count)
-      }.should raise_error /ActiveRecord::ReadOnlyRecord/
+      }.should_not change(User, :count)
     end
   end