refinerycms-authentication 2.0.10 → 2.1.0

data/spec/{requests → features}/refinery/admin/users_spec.rb

@@ -1,17 +1,17 @@
 require "spec_helper"
 
-describe "manage users" do
-  login_refinery_superuser
+describe "User admin page" do
+  refinery_login_with :refinery_superuser
 
   describe "new/create" do
     def visit_and_fill_form
       visit refinery.admin_users_path
       click_link "Add new user"
 
-      fill_in "Username", :with => "test"
-      fill_in "Email", :with => "test@refinerycms.com"
-      fill_in "Password", :with => "123456"
-      fill_in "Password confirmation", :with => "123456"
+      fill_in "user[username]", :with => "test"
+      fill_in "user[email]", :with => "test@refinerycms.com"
+      fill_in "user[password]", :with => "123456"
+      fill_in "user[password_confirmation]", :with => "123456"
     end
 
     it "can create a user" do
@@ -43,7 +43,7 @@ describe "manage users" do
   end
 
   describe "edit/update" do
-    it "allows to update user" do
+    it "can update a user" do
       visit refinery.admin_users_path
       click_link "Edit this user"
 
@@ -73,14 +73,14 @@ describe "manage users" do
   describe "destroy" do
     let!(:user) { FactoryGirl.create(:user, :username => "ugisozols") }
 
-    it "allows to destroy only regular user" do
+    it "can only destroy regular users" do
       visit refinery.admin_users_path
       page.should have_selector("a[href='/refinery/users/#{user.username}']")
-      page.should have_no_selector("a[href='/refinery/users/refinerycms']")
+      page.should have_no_selector("a[href='/refinery/users/#{logged_in_user.username}']")
 
       click_link "Remove this user"
       page.should have_content("'#{user.username}' was successfully removed.")
-      page.should have_content("refinerycms (refinerycms@refinerycms.com)")
+      page.should have_content("#{logged_in_user.username} (#{logged_in_user.email})")
     end
   end
 end

data/spec/{requests → features}/refinery/passwords_spec.rb

@@ -6,7 +6,7 @@ module Refinery
       let!(:user) { FactoryGirl.create(:refinery_user, :email => "refinery@refinerycms.com") }
 
       it "asks user to specify email address" do
-        visit refinery.new_refinery_user_session_path
+        visit refinery.login_path
         click_link "I forgot my password"
         page.should have_content("Please enter the email address for your account.")
       end

data/spec/{requests → features}/refinery/sessions_spec.rb

@@ -8,9 +8,10 @@ module Refinery
 
     before do
       FactoryGirl.create(:refinery_user, :username => "ugisozols",
-                              :password => "123456",
-                              :password_confirmation => "123456")
-      visit login_path
+                                         :password => "123456",
+                                         :password_confirmation => "123456")
+
+      visit refinery.login_path
     end
 
     it "shows login form" do
@@ -21,7 +22,7 @@ module Refinery
 
     context "when supplied data is valid" do
       it "logs in user" do
-        fill_in "Login", :with => "ugisozols"
+        fill_in "Username or email", :with => "ugisozols"
         fill_in "Password", :with => "123456"
         click_button "Sign in"
         page.should have_content("Signed in successfully.")
@@ -31,7 +32,7 @@ module Refinery
 
     context "when supplied data is not valid" do
       it "shows flash error" do
-        fill_in "Login", :with => "Hmmm"
+        fill_in "Username or email", :with => "Hmmm"
         fill_in "Password", :with => "Hmmm"
         click_button "Sign in"
         page.should have_content("Sorry, your login or password was incorrect.")
@@ -48,14 +49,14 @@ module Refinery
     describe 'when there are no users' do
       it 'allows user creation' do
         # Verify that we can access the sign up page.
-        visit refinery.root_path
+        visit refinery.admin_root_path
         page.should have_content("There are no users yet, so we'll set you up first")
 
         # Fill in user details.
-        fill_in 'Username', :with => 'rspec'
-        fill_in 'Email', :with => 'rspec@example.com'
-        fill_in 'Password', :with => 'spectacular'
-        fill_in 'Password confirmation', :with => 'spectacular'
+        fill_in 'user[username]', :with => 'rspec'
+        fill_in 'user[email]', :with => 'rspec@example.com'
+        fill_in 'user[password]', :with => 'spectacular'
+        fill_in 'user[password_confirmation]', :with => 'spectacular'
 
         # Sign up and verify!
         click_button "Sign up"
@@ -92,7 +93,7 @@ module Refinery
       end
 
       it "redirects to the protected path on login" do
-        fill_in "Login", :with => "ugisozols"
+        fill_in "Username or email", :with => "ugisozols"
         fill_in "Password", :with => "123456"
         page.click_button "Sign in"
         current_path.should == protected_path

data/spec/models/refinery/user_spec.rb

@@ -51,7 +51,7 @@ module Refinery
     context "validations" do
       # email and password validations are done by including devises validatable
       # module so those validations are not tested here
-      let(:attr) do
+      let(:attributes) do
         {
           :username => "Refinery CMS",
           :email => "refinery@cms.com",
@@ -61,17 +61,28 @@ module Refinery
       end
 
       it "requires username" do
-        User.new(attr.merge(:username => "")).should_not be_valid
+        User.new(attributes.merge(:username => "")).should_not be_valid
       end
 
       it "rejects duplicate usernames" do
-        User.create!(attr)
-        User.new(attr.merge(:email => "another@email.com")).should_not be_valid
+        User.create!(attributes)
+        User.new(attributes.merge(:email => "another@email.com")).should_not be_valid
       end
 
       it "rejects duplicate usernames regardless of case" do
-        User.create!(attr)
-        User.new(attr.merge(:username => attr[:username].upcase, :email => "another@email.com")).should_not be_valid
+        User.create!(attributes)
+        User.new(attributes.merge(
+          :username => attributes[:username].upcase,
+          :email => "another@email.com")
+        ).should_not be_valid
+      end
+
+      it "rejects duplicate usernames regardless of whitespace" do
+        User.create!(attributes)
+        new_user = User.new(attributes.merge(:username => " Refinery   CMS "))
+        new_user.valid?
+        new_user.username.should == 'refinery cms'
+        new_user.should_not be_valid
       end
     end
 
@@ -152,10 +163,46 @@ module Refinery
     end
 
     describe "#plugins=" do
-      it "assigns plugins to user" do
-        plugin_list = ["refinery_one", "refinery_two", "refinery_three"]
-        user.plugins = plugin_list
-        user.plugins.collect { |p| p.name }.should == plugin_list
+      context "when user is not persisted" do
+        it "does not add plugins for this user" do
+          new_user = FactoryGirl.build(:user)
+          new_user.plugins = ["test"]
+          new_user.plugins.should be_empty
+        end
+      end
+
+      context "when user is persisted" do
+        it "only assigns plugins with names that are of string type" do
+          user.plugins = [1, :test, false, "refinery_one"]
+          user.plugins.collect(&:name).should eq(["refinery_one"])
+        end
+
+        it "won't raise exception if plugins position is not a number" do
+          Refinery::UserPlugin.create! :name => "refinery_one", :user_id => user.id
+
+          expect { user.plugins = ["refinery_one", "refinery_two"] }.to_not raise_error
+        end
+
+        context "when no plugins assigned" do
+          it "assigns them to user" do
+            user.plugins.should eq([])
+
+            plugin_list = ["refinery_one", "refinery_two", "refinery_three"]
+            user.plugins = plugin_list
+            user.plugins.collect(&:name).should eq(plugin_list)
+          end
+        end
+
+        context "when plugins are already assigned" do
+          it "only adds new ones and deletes ones that are not used" do
+            user.plugins = ["refinery_one", "refinery_two", "refinery_three"]
+            new_plugin_list = ["refinery_one", "refinery_two", "refinery_four"]
+
+            user.plugins = new_plugin_list
+            user.plugins.reload
+            user.plugins.collect(&:name).should eq(new_plugin_list)
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-authentication
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -18,42 +18,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: orm_adapter
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 2.2.3
 description: The default authentication extension for Refinery CMS
 email: info@refinerycms.com
 executables: []
@@ -98,6 +104,7 @@ files:
 - config/locales/es.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ko.yml
@@ -107,16 +114,20 @@ files:
 - config/locales/nl.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
+- config/locales/pt.yml
 - config/locales/rs.yml
 - config/locales/ru.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/sv.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234705_create_refinerycms_authentication_schema.rb
+- db/migrate/20120301234455_add_slug_to_refinery_users.rb
 - lib/generators/refinery/authentication/authentication_generator.rb
 - lib/generators/refinery/authentication/templates/config/initializers/refinery/authentication.rb.erb
 - lib/refinery/authenticated_system.rb
@@ -129,10 +140,10 @@ files:
 - refinerycms-authentication.gemspec
 - spec/controllers/refinery/admin/users_controller_spec.rb
 - spec/factories/user.rb
+- spec/features/refinery/admin/users_spec.rb
+- spec/features/refinery/passwords_spec.rb
+- spec/features/refinery/sessions_spec.rb
 - spec/models/refinery/user_spec.rb
-- spec/requests/refinery/admin/users_spec.rb
-- spec/requests/refinery/passwords_spec.rb
-- spec/requests/refinery/sessions_spec.rb
 homepage: http://refinerycms.com
 licenses:
 - MIT
@@ -160,7 +171,7 @@ summary: Authentication extension for Refinery CMS
 test_files:
 - spec/controllers/refinery/admin/users_controller_spec.rb
 - spec/factories/user.rb
+- spec/features/refinery/admin/users_spec.rb
+- spec/features/refinery/passwords_spec.rb
+- spec/features/refinery/sessions_spec.rb
 - spec/models/refinery/user_spec.rb
-- spec/requests/refinery/admin/users_spec.rb
-- spec/requests/refinery/passwords_spec.rb
-- spec/requests/refinery/sessions_spec.rb