sorcery 0.8.4 → 0.8.5

data/spec/{rails3/spec → active_record}/integration_spec.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "the login process", :type => :request do
   before(:all) do
     sorcery_reload!
     create_new_user
   end
-  
+
   after(:all) do
   end
 end

data/spec/{rails3/spec → active_record}/user_activation_spec.rb

@@ -1,16 +1,18 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../app/mailers/sorcery_mailer')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_activation_shared_examples')
+require 'spec_helper'
+
+require 'rails_app/app/mailers/sorcery_mailer'
+require 'shared_examples/user_activation_shared_examples'
 
 describe "User with activation submodule" do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
+    User.reset_column_information
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
   end
 
   it_behaves_like "rails_3_activation_model"
-  
-end
+
+end

data/spec/active_record/user_activity_logging_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'shared_examples/user_activity_logging_shared_examples'
+
+describe "User with activity logging submodule" do
+
+  it_behaves_like "rails_3_activity_logging_model"
+
+end

data/spec/{rails3/spec → active_record}/user_brute_force_protection_spec.rb

@@ -1,15 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_brute_force_protection_shared_examples')
+require 'spec_helper'
+require 'shared_examples/user_brute_force_protection_shared_examples'
 
 describe "User with brute_force_protection submodule" do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/brute_force_protection")
+    User.reset_column_information
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/brute_force_protection")
   end
 
   it_behaves_like "rails_3_brute_force_protection_model"
-  
+
 end

data/spec/{rails3/spec → active_record}/user_oauth_spec.rb

@@ -1,15 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_oauth_shared_examples')
+require 'spec_helper'
+require 'shared_examples/user_oauth_shared_examples'
 
 describe "User with oauth submodule" do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+    User.reset_column_information
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
 
   it_behaves_like "rails_3_oauth_model"
-  
+
 end

data/spec/{rails3/spec → active_record}/user_remember_me_spec.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_remember_me_shared_examples')
+require 'spec_helper'
+require 'shared_examples/user_remember_me_shared_examples'
 
 describe "User with remember_me submodule" do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
+    User.reset_column_information
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/remember_me")
   end

data/spec/{rails3/spec → active_record}/user_reset_password_spec.rb

@@ -1,16 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_reset_password_shared_examples')
-
+require 'spec_helper'
+require 'shared_examples/user_reset_password_shared_examples'
 
 describe "User with reset_password submodule" do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/reset_password")
+    User.reset_column_information
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/reset_password")
   end
 
   it_behaves_like "rails_3_reset_password_model"
-  
-end
+
+end

data/spec/{rails3/spec → active_record}/user_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../app/mailers/sorcery_mailer')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_shared_examples')
+require 'spec_helper'
+
+require 'rails_app/app/mailers/sorcery_mailer'
+require 'shared_examples/user_shared_examples'
 
 describe "User with no submodules (core)" do
   before(:all) do
@@ -11,26 +12,27 @@ describe "User with no submodules (core)" do
     it "should respond to the plugin activation class method" do
       ActiveRecord::Base.should respond_to(:authenticates_with_sorcery!)
     end
-    
+
     it "User should respond_to .authenticates_with_sorcery!" do
       User.should respond_to(:authenticates_with_sorcery!)
     end
   end
-  
+
   # ----------------- PLUGIN CONFIGURATION -----------------------
 
   it_should_behave_like "rails_3_core_model"
-  
+
   describe User, "external users" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
-      sorcery_reload!()
+      User.reset_column_information
+      sorcery_reload!
     end
-  
+
     after(:all) do
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
     end
-    
+
     it_should_behave_like "external_user"
   end
-end
+end

data/spec/{rails3_mongo_mapper/spec → mongo_mapper}/controller_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-describe ApplicationController do
+describe SorceryController do
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe ApplicationController, "plugin configuration" do
+  describe SorceryController, "plugin configuration" do
     before(:all) do
       sorcery_reload!
     end
@@ -26,7 +26,7 @@ describe ApplicationController do
   end
 
   # ----------------- PLUGIN ACTIVATED -----------------------
-  describe ApplicationController, "when activated with sorcery" do
+  describe SorceryController, "when activated with sorcery" do
     before(:all) do
       sorcery_reload!
       User.delete_all
@@ -53,52 +53,52 @@ describe ApplicationController do
     specify { should respond_to(:current_user) }
 
     it "login(username,password) should return the user when success and set the session with user.id" do
-      get :test_login, :username => 'gizmo', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(email,password) should return the user when success and set the session with user.id" do
-      get :test_login, :username => 'bla@bla.com', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(username,password) should return nil and not set the session when failure" do
-      get :test_login, :username => 'gizmo', :password => 'opensesame!'
+      get :test_login, :email => 'bla@bla.com', :password => 'opensesame!'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(username,password) should return nil and not set the session when upper case username" do
-      get :test_login, :username => 'GIZMO', :password => 'secret'
+      get :test_login, :email => 'BLA@BLA.COM', :password => 'secret'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(email,password) should return the user when success and set the session with the _csrf_token" do
-      get :test_login, :username => 'gizmo', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       session[:_csrf_token].should_not be_nil
     end
 
     it "login(username,password) should return the user and set the session with user.id when upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
-      get :test_login, :username => 'GIZMO', :password => 'secret'
+      get :test_login, :email => 'BLA@BLA.COM', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(username,password) should return nil and not set the session when user was created with upper case username, config is default, and log in username is lower case" do
-      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
-      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      create_new_user({:username => 'GIZMO1', :email => "BLA1@BLA.com", :password => 'secret1'})
+      get :test_login, :email => 'bla1@bla.com', :password => 'secret1'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(username,password) should return the user and set the session with user.id when user was created with upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
-      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
-      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      create_new_user({:username => 'GIZMO1', :email => "BLA1@BLA.com", :password => 'secret1'})
+      get :test_login, :email => 'bla1@bla.com', :password => 'secret1'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
@@ -142,7 +142,7 @@ describe ApplicationController do
 
     it "require_login before_filter should save the url that the user originally wanted" do
       get :some_action
-      session[:return_to_url].should == "http://test.host/application/some_action"
+      session[:return_to_url].should == "http://test.host/some_action"
       response.should redirect_to("http://test.host/")
     end
 

data/spec/mongo_mapper/user_activation_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+require 'rails_app/app/mailers/sorcery_mailer'
+require 'shared_examples/user_activation_shared_examples'
+
+describe "User with activation submodule" do
+
+  it_behaves_like "rails_3_activation_model"
+
+end

data/spec/mongo_mapper/user_activity_logging_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'shared_examples/user_activity_logging_shared_examples'
+
+describe "User with activity logging submodule" do
+
+  it_behaves_like "rails_3_activity_logging_model"
+
+end

data/spec/mongo_mapper/user_brute_force_protection_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'shared_examples/user_brute_force_protection_shared_examples'
+
+describe "User with brute_force_protection submodule" do
+
+  it_behaves_like "rails_3_brute_force_protection_model"
+
+end

data/spec/mongo_mapper/user_oauth_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'shared_examples/user_oauth_shared_examples'
+
+describe "User with oauth submodule" do
+
+  it_behaves_like "rails_3_oauth_model"
+
+end

data/spec/mongo_mapper/user_remember_me_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'shared_examples/user_remember_me_shared_examples'
+
+describe "User with remember_me submodule" do
+
+  it_behaves_like "rails_3_remember_me_model"
+
+end

data/spec/mongo_mapper/user_reset_password_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'shared_examples/user_reset_password_shared_examples'
+
+describe "User with reset_password submodule" do
+
+  it_behaves_like "rails_3_reset_password_model"
+
+end

data/spec/{rails3_mongo_mapper/spec → mongo_mapper}/user_spec.rb

@@ -1,6 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../app/mailers/sorcery_mailer')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_shared_examples')
+require 'spec_helper'
+
+require 'rails_app/app/mailers/sorcery_mailer'
+require 'shared_examples/user_shared_examples'
 
 describe "User with no submodules (core)" do
   before(:all) do
@@ -12,15 +13,15 @@ describe "User with no submodules (core)" do
       User.should respond_to(:authenticates_with_sorcery!)
     end
   end
-  
+
   # ----------------- PLUGIN CONFIGURATION -----------------------
-  
+
   it_should_behave_like "rails_3_core_model"
-  
+
   describe User, "external users" do
 
     it_should_behave_like "external_user"
-    
+
   end
 
   describe User, "when inherited" do
@@ -34,4 +35,4 @@ describe "User with no submodules (core)" do
       SubUser.keys.should include("blabla")
     end
   end
-end
+end

data/spec/{rails3_mongoid/spec → mongoid}/controller_activity_logging_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
+
+describe SorceryController do
 
-describe ApplicationController do
-  
   # ----------------- ACTIVITY LOGGING -----------------------
-  describe ApplicationController, "with activity logging features" do
+  describe SorceryController, "with activity logging features" do
     before(:all) do
       sorcery_reload!([:activity_logging])
     end
@@ -15,7 +15,7 @@ describe ApplicationController do
     after(:each) do
       User.delete_all
     end
-    
+
     specify { subject.should respond_to(:current_users) }
 
     it "'current_users' should be empty when no users are logged in" do
@@ -84,14 +84,14 @@ describe ApplicationController do
       subject.current_users[1].should == user2
       subject.current_users[2].should == user3
     end
-    
+
     it "should not register login time if configured so" do
       sorcery_controller_property_set(:register_login_time, false)
       now = Time.now.in_time_zone
       login_user
       @user.last_login_at.should be_nil
     end
-    
+
     it "should not register logout time if configured so" do
       sorcery_controller_property_set(:register_logout_time, false)
       now = Time.now.in_time_zone
@@ -99,7 +99,7 @@ describe ApplicationController do
       logout_user
       @user.last_logout_at.should be_nil
     end
-    
+
     it "should not register last activity time if configured so" do
       sorcery_controller_property_set(:register_last_activity_time, false)
       now = Time.now.in_time_zone

data/spec/{rails3_mongoid/spec → mongoid}/controller_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-describe ApplicationController do
+describe SorceryController do
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe ApplicationController, "plugin configuration" do
+  describe SorceryController, "plugin configuration" do
     before(:all) do
       sorcery_reload!
     end
@@ -26,7 +26,7 @@ describe ApplicationController do
   end
 
   # ----------------- PLUGIN ACTIVATED -----------------------
-  describe ApplicationController, "when activated with sorcery" do
+  describe SorceryController, "when activated with sorcery" do
     before(:all) do
       sorcery_reload!
       User.delete_all
@@ -53,44 +53,44 @@ describe ApplicationController do
     specify { should respond_to(:current_user) }
 
     it "login(username,password) should return the user when success and set the session with user.id" do
-      get :test_login, :username => 'gizmo', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(email,password) should return the user when success and set the session with user.id" do
-      get :test_login, :username => 'bla@bla.com', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(username,password) should return nil and not set the session when failure" do
-      get :test_login, :username => 'gizmo', :password => 'opensesame!'
+      get :test_login, :email => 'bla@bla.com', :password => 'opensesame!'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(username,password) should return nil and not set the session when upper case username" do
-      get :test_login, :username => 'GIZMO', :password => 'secret'
+      get :test_login, :email => 'BLA@BLA.com', :password => 'secret'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(email,password) should return the user when success and set the session with the _csrf_token" do
-      get :test_login, :username => 'gizmo', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       session[:_csrf_token].should_not be_nil
     end
 
     it "login(username,password) should return the user and set the session with user.id when upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
-      get :test_login, :username => 'GIZMO', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(username,password) should return nil and not set the session when user was created with upper case username, config is default, and log in username is lower case" do
-      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
-      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      create_new_user({:username => 'GIZMO1', :email => "BLA1@BLA.com", :password => 'secret1'})
+      get :test_login, :email => 'bla1@bla.com', :password => 'secret1'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
@@ -98,7 +98,7 @@ describe ApplicationController do
     it "login(username,password) should return the user and set the session with user.id when user was created with upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
       create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
-      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      get :test_login, :email => 'bla1@bla.com', :password => 'secret1'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
@@ -153,7 +153,7 @@ describe ApplicationController do
 
     it "require_login before_filter should save the url that the user originally wanted" do
       get :some_action
-      session[:return_to_url].should == "http://test.host/application/some_action"
+      session[:return_to_url].should == "http://test.host/some_action"
       response.should redirect_to("http://test.host/")
     end