switching from cucumber syntax to rspec because i got it to work with rspec it seems.

factory_girl seems to want to be loaded explicitly, so whatever.

Author: stevenyxu

Rakefile

@@ -1,9 +1,8 @@
-require File.expand_path('test/rails_app/config/environment', File.dirname(__FILE__))
-require 'rake/testtask'
+require File.expand_path('spec/rails_app/config/environment', File.dirname(__FILE__))
 require 'rdoc/task'
 
 desc 'Default: run test suite.'
-task :default => :test
+task :default => :spec
 
 desc 'Generate documentation for the devise_ldap_authenticatable plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

devise_ldap_authenticatable.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('ruby-prof')
   s.add_development_dependency('factory_girl_rails', '~> 1.0')
+  s.add_development_dependency('factory_girl', '~> 2.0')
   s.add_development_dependency('shoulda', '~> 2.11')
   s.add_development_dependency('rspec-rails')
 

test/ldap/base.ldif spec/ldap/base.ldif

@@ -3,8 +3,9 @@
 require File.expand_path("rails_app/config/environment.rb",  File.dirname(__FILE__))
 require 'rspec/rails'
 require 'rspec/autorun'
+require 'factory_girl' # not sure why this is not already required
 
-Rails.backtrace_cleaner.remove_silencers!
+Dir[File.expand_path("support/**/*.rb", File.dirname(__FILE__))].each {|f| require f}
 
 RSpec.configure do |config|
   config.mock_with :rspec

test/ldap/clear.ldif spec/ldap/clear.ldif

@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :user do
+    email "[email protected]"
+    password "secret"
+  end
+
+  factory :admin, :class => User do
+    email "[email protected]"
+    password "admin_secret"
+  end
+
+  factory :other, :class => User do
+    email "[email protected]"
+    password "other_secret"
+  end
+end

test/ldap/local.schema spec/ldap/local.schema

@@ -1,6 +1,6 @@
-require 'test_helper'
+require 'spec_helper'
 
-class UserTest < ActiveSupport::TestCase
+describe 'Users' do
 
   def should_be_validated(user, password, message = "Password is invalid")
     assert(user.valid_ldap_authentication?(password), message)
@@ -10,47 +10,47 @@ def should_not_be_validated(user, password, message = "Password is not properly
      assert(!user.valid_ldap_authentication?(password), message)
   end
 
-  context "With default settings" do
-    setup do
+  describe "With default settings" do
+    before do
       default_devise_settings!
       reset_ldap_server!
     end
 
-    context "look up and ldap user" do
-      should "return true for a user that does exist in LDAP" do
+    describe "look up and ldap user" do
+      it "should return true for a user that does exist in LDAP" do
         assert_equal true, ::Devise::LdapAdapter.valid_login?('[email protected]')
       end
 
-      should "return false for a user that doesn't exist in LDAP" do
+      it "should return false for a user that doesn't exist in LDAP" do
         assert_equal false, ::Devise::LdapAdapter.valid_login?('barneystinson')
       end
     end
 
-    context "create a basic user" do
-      setup do
-        @user = Factory(:user)
+    describe "create a basic user" do
+      before do
+        @user = Factory.create(:user)
       end
 
-      should "check for password validation" do
+      it "should check for password validation" do
         assert_equal(@user.email, "[email protected]")
         should_be_validated @user, "secret"
         should_not_be_validated @user, "wrong_secret"
         should_not_be_validated @user, "Secret"
       end
     end
 
-    context "change a LDAP password" do
-      setup do
-        @user = Factory(:user)
+    describe "change a LDAP password" do
+      before do
+        @user = Factory.create(:user)
       end
 
-      should "change password" do
+      it "should change password" do
         should_be_validated @user, "secret"
         @user.reset_password!("changed","changed")
         should_be_validated @user, "changed", "password was not changed properly on the LDAP sevrer"
       end
 
-      should "not allow to change password if setting is false" do
+      it "should not allow to change password if setting is false" do
         should_be_validated @user, "secret"
         ::Devise.ldap_update_password = false
         @user.reset_password!("wrong_secret", "wrong_secret")
@@ -59,57 +59,57 @@ def should_not_be_validated(user, password, message = "Password is not properly
       end
     end
 
-    context "create new local user if user is in LDAP" do
+    describe "create new local user if user is in LDAP" do
 
-      setup do
+      before do
         assert(User.all.blank?, "There shouldn't be any users in the database")
       end
 
-      should "don't create user in the database" do
+      it "should don't create user in the database" do
         @user = User.authenticate_with_ldap(:email => "[email protected]", :password => "secret")
         assert(User.all.blank?)
       end
 
-      context "creating users is enabled" do
-        setup do
+      describe "creating users is enabled" do
+        before do
           ::Devise.ldap_create_user = true
         end
 
-        should "create a user in the database" do
+        it "should create a user in the database" do
           @user = User.authenticate_with_ldap(:email => "[email protected]", :password => "secret")
           assert_equal(User.all.size, 1)
           assert_contains(User.all.collect(&:email), "[email protected]", "user not in database")
         end
 
-        should "not create a user in the database if the password is wrong_secret" do
+        it "should not create a user in the database if the password is wrong_secret" do
           @user = User.authenticate_with_ldap(:email => "example.user", :password => "wrong_secret")
           assert(User.all.blank?, "There's users in the database")
         end
 
-        should "create a user if the user is not in LDAP" do
+        it "should create a user if the user is not in LDAP" do
           @user = User.authenticate_with_ldap(:email => "[email protected]", :password => "wrong_secret")
           assert(User.all.blank?, "There's users in the database")
         end
 
-        should "create a user in the database if case insensitivity does not matter" do
+        it "should create a user in the database if case insensitivity does not matter" do
           ::Devise.case_insensitive_keys = false
-          @user = Factory(:user)
+          @user = Factory.create(:user)
 
           assert_difference "User.count", +1 do
             User.authenticate_with_ldap(:email => "[email protected]", :password => "secret")
           end
         end
 
-        should "not create a user in the database if case insensitivity matters" do
+        it "should not create a user in the database if case insensitivity matters" do
           ::Devise.case_insensitive_keys = [:email]
-          @user = Factory(:user)
+          @user = Factory.create(:user)
 
           assert_no_difference "User.count" do
             User.authenticate_with_ldap(:email => "[email protected]", :password => "secret")
           end
         end
 
-        should "create a user with downcased email in the database if case insensitivity matters" do
+        it "should create a user with downcased email in the database if case insensitivity matters" do
           ::Devise.case_insensitive_keys = [:email]
 
           @user = User.authenticate_with_ldap(:email => "[email protected]", :password => "secret")
@@ -119,94 +119,94 @@ def should_not_be_validated(user, password, message = "Password is not properly
 
     end
 
-    context "use groups for authorization" do
-      setup do
-        @admin = Factory(:admin)
-        @user = Factory(:user)
+    describe "use groups for authorization" do
+      before do
+        @admin = Factory.create(:admin)
+        @user = Factory.create(:user)
         ::Devise.authentication_keys = [:email]
         ::Devise.ldap_check_group_membership = true
       end
 
-      should "admin should be allowed in" do
+      it "should admin should be allowed in" do
         should_be_validated @admin, "admin_secret"
       end
 
-      should "admin should have the proper groups set" do
+      it "should admin should have the proper groups set" do
         assert_contains(@admin.ldap_groups, /cn=admins/, "groups attribute not being set properly")
       end
 
-      should "user should not be allowed in" do
+      it "should user should not be allowed in" do
         should_not_be_validated @user, "secret"
       end
 
-      should "not be validated if group with different attribute is removed" do
+      it "should not be validated if group with different attribute is removed" do
         `ldapmodify #{ldap_connect_string} -f ../ldap/delete_authorization_role.ldif`
         should_not_be_validated @admin, "admin_secret"
       end
     end
 
-    context "use role attribute for authorization" do
-      setup do
-        @admin = Factory(:admin)
-        @user = Factory(:user)
+    describe "use role attribute for authorization" do
+      before do
+        @admin = Factory.create(:admin)
+        @user = Factory.create(:user)
         ::Devise.ldap_check_attributes = true
       end
 
-      should "admin should be allowed in" do
+      it "should admin should be allowed in" do
         should_be_validated @admin, "admin_secret"
       end
 
-      should "user should not be allowed in" do
+      it "should user should not be allowed in" do
         should_not_be_validated @user, "secret"
       end
     end
 
-    context "use admin setting to bind" do
-      setup do
-        @admin = Factory(:admin)
-        @user = Factory(:user)
+    describe "use admin setting to bind" do
+      before do
+        @admin = Factory.create(:admin)
+        @user = Factory.create(:user)
         ::Devise.ldap_use_admin_to_bind = true
       end
 
-      should "description" do
+      it "should description" do
         should_be_validated @admin, "admin_secret"
       end
     end
 
   end
 
-  context "use uid for login" do
-    setup do
+  describe "use uid for login" do
+    before do
       default_devise_settings!
       reset_ldap_server!
       ::Devise.ldap_config = "#{Rails.root}/config/#{"ssl_" if ENV["LDAP_SSL"]}ldap_with_uid.yml"
       ::Devise.authentication_keys = [:uid]
     end
 
-    context "description" do
-      setup do
-        @admin = Factory(:admin)
-        @user = Factory(:user, :uid => "example_user")
+    describe "description" do
+      before do
+        @admin = Factory.create(:admin)
+        @user = Factory.create(:user, :uid => "example_user")
       end
 
-      should "be able to authenticate using uid" do
+      it "should be able to authenticate using uid" do
         should_be_validated @user, "secret"
         should_not_be_validated @admin, "admin_secret"
       end
     end
 
-    context "create user" do
-      setup do
+    describe "create user" do
+      before do
         ::Devise.ldap_create_user = true
       end
 
-      should "create a user in the database" do
+      it "should create a user in the database" do
         @user = User.authenticate_with_ldap(:uid => "example_user", :password => "secret")
         assert_equal(User.all.size, 1)
         assert_contains(User.all.collect(&:uid), "example_user", "user not in database")
       end
 
-      should "call ldap_before_save hooks" do
+      it "should call ldap_before_save hooks" do
         User.class_eval do
           def ldap_before_save
             @foobar = 'foobar'
@@ -219,59 +219,59 @@ def ldap_before_save
         end
       end
 
-      should "not call ldap_before_save hook if not defined" do
+      it "should not call ldap_before_save hook if not defined" do
         assert_nothing_raised do
-          should_be_validated Factory(:user, :uid => "example_user"), "secret"
+          should_be_validated Factory.create(:user, :uid => "example_user"), "secret"
         end
       end
     end
   end
 
-  context "using ERB in the config file" do
-    setup do
+  describe "using ERB in the config file" do
+    before do
       default_devise_settings!
       reset_ldap_server!
       ::Devise.ldap_config = "#{Rails.root}/config/#{"ssl_" if ENV["LDAP_SSL"]}ldap_with_erb.yml"
     end
 
-    context "authenticate" do
-      setup do
-        @admin = Factory(:admin)
-        @user = Factory(:user)
+    describe "authenticate" do
+      before do
+        @admin = Factory.create(:admin)
+        @user = Factory.create(:user)
       end
 
-      should "be able to authenticate" do
+      it "should be able to authenticate" do
         should_be_validated @user, "secret"
         should_be_validated @admin, "admin_secret"
       end
     end
   end
 
-  context "using variants in the config file" do
-    setup do
+  describe "using variants in the config file" do
+    before do
       default_devise_settings!
       reset_ldap_server!
       ::Devise.ldap_config = Rails.root.join 'config', 'ldap_with_boolean_ssl.yml'
     end
 
-    should "not fail if config file has ssl: true" do
+    it "should not fail if config file has ssl: true" do
       assert_nothing_raised do
         Devise::LdapAdapter::LdapConnect.new
       end
     end
   end
 
-  context "use username builder" do
-    setup do
+  describe "use username builder" do
+    before do
       default_devise_settings!
       reset_ldap_server!
       ::Devise.ldap_auth_username_builder = Proc.new() do |attribute, login, ldap|
         "#{attribute}=#{login},ou=others,dc=test,dc=com"
       end
-      @other = Factory(:other)
+      @other = Factory.create(:other)
     end
 
-    should "be able to authenticate" do
+    it "should be able to authenticate" do
       should_be_validated @other, "other_secret"
     end
   end