zen 0.3 → 0.4

data/spec/zen/package/settings/settings.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../../helper', __FILE__)
 
-describe('Settings::Setting') do
-  it('Register a settings group') do
+describe 'Settings::Setting' do
+  it 'Register a settings group' do
     Settings::SettingsGroup.add do |group|
       group.name  = 'general_spec'
       group.title = 'General Spec'
@@ -13,7 +13,7 @@ describe('Settings::Setting') do
       .title.should == 'General Spec'
   end
 
-  it('Register an already existing settings group') do
+  it 'Register an already existing settings group' do
     should.raise?(Zen::ValidationError) do
       Settings::SettingsGroup.add do |group|
         group.name  = 'general_spec'
@@ -22,7 +22,7 @@ describe('Settings::Setting') do
     end
   end
 
-  it('Register a setting with an invalid type') do
+  it 'Register a setting with an invalid type' do
     should.raise?(Zen::ValidationError) do
       Settings::Setting.add do |setting|
         setting.name  = 'invalid'
@@ -33,7 +33,7 @@ describe('Settings::Setting') do
     end
   end
 
-  it('Register a setting with an invalid group') do
+  it 'Register a setting with an invalid group' do
     should.raise?(Zen::ValidationError) do
       Settings::Setting.add do |setting|
         setting.name  = 'invalid'
@@ -44,7 +44,7 @@ describe('Settings::Setting') do
     end
   end
 
-  it('Register two settings') do
+  it 'Register two settings' do
     Settings::Setting.add do |setting|
       setting.name        = 'spec'
       setting.title       = 'Spec'
@@ -65,7 +65,7 @@ describe('Settings::Setting') do
     Settings::Setting::REGISTERED.key?(:spec_textbox).should == true
   end
 
-  it('Register an already existing setting') do
+  it 'Register an already existing setting' do
     should.raise?(Zen::ValidationError) do
       Settings::Setting.add do |setting|
         setting.name   = 'spec'
@@ -76,13 +76,13 @@ describe('Settings::Setting') do
     end
   end
 
-  it('Retrieve a non existing setting') do
+  it 'Retrieve a non existing setting' do
     should.raise?(ArgumentError) do
       get_setting('invalid')
     end
   end
 
-  it('Retrieve a setting') do
+  it 'Retrieve a setting' do
     setting = get_setting('spec')
 
     setting.title.should       == 'Spec'
@@ -91,14 +91,14 @@ describe('Settings::Setting') do
     setting.description.should == 'An example of a setting with a select box.'
   end
 
-  it('Migrate all settings') do
+  it 'Migrate all settings' do
     Settings::Setting.migrate
 
     Settings::Model::Setting[:name => 'spec'].nil?.should         == false
     Settings::Model::Setting[:name => 'spec_textbox'].nil?.should == false
   end
 
-  it('Update a setting') do
+  it 'Update a setting' do
     Ramaze.setup_dependencies
 
     get_setting(:spec).value = 'Setting value'
@@ -109,7 +109,7 @@ describe('Settings::Setting') do
       == Ramaze::Cache.settings.fetch(:spec)
   end
 
-  it('Remove all settings') do
+  it 'Remove all settings' do
     Settings::Setting.remove('spec')
     Settings::Setting.remove(['spec_textbox'])
 

data/spec/zen/package/users/controller/user_groups.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../../../../helper', __FILE__)
 
 Zen::Language.load('user_groups')
 
-describe('Users::Controller::UserGroups') do
+describe 'Users::Controller::UserGroups' do
   behaves_like :capybara
 
   index_url     = Users::Controller::UserGroups.r(:index).to_s
@@ -10,16 +10,7 @@ describe('Users::Controller::UserGroups') do
   new_button    = lang('user_groups.buttons.new')
   delete_button = lang('user_groups.buttons.delete')
 
-  it('Submit a form without a CSRF token') do
-    response = page.driver.post(
-      Users::Controller::UserGroups.r(:save).to_s
-    )
-
-    response.body.include?(lang('zen_general.errors.csrf')).should == true
-    response.status.should                                         == 403
-  end
-
-  it('Find a single user group') do
+  it 'Find a single user group' do
     message = lang('user_groups.messages.no_groups')
 
     visit(index_url)
@@ -29,11 +20,23 @@ describe('Users::Controller::UserGroups') do
     page.all('table tbody tr').count.should     == 1
   end
 
-  it('Create a new user group') do
+  it 'Try to create a new user group with a missing CSRF token' do
     visit(index_url)
     click_link(new_button)
 
-    within('#user_group_form') do
+    within '#user_group_form' do
+      find('input[name="csrf_token"]').set('')
+      click_on(save_button)
+    end
+
+    page.has_content?(lang('zen_general.errors.csrf')).should == true
+  end
+
+  it 'Create a new user group' do
+    visit(index_url)
+    click_link(new_button)
+
+    within '#user_group_form' do
       fill_in('name', :with => 'Spec group')
       choose('form_super_group_0')
       click_on(save_button)
@@ -43,13 +46,13 @@ describe('Users::Controller::UserGroups') do
     page.find('#form_super_group_0').checked?.should == 'checked'
   end
 
-  it('Search for a user group') do
+  it 'Search for a user group' do
     search_button = lang('zen_general.buttons.search')
     error         = lang('zen_general.errors.invalid_search')
 
     visit(index_url)
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'Spec group')
       click_on(search_button)
     end
@@ -57,7 +60,7 @@ describe('Users::Controller::UserGroups') do
     page.has_content?(error).should        == false
     page.has_content?('Spec group').should == true
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'does not exist')
       click_on(search_button)
     end
@@ -66,7 +69,7 @@ describe('Users::Controller::UserGroups') do
     page.has_content?('Spec group').should == false
   end
 
-  it('Edit an existing user group') do
+  it 'Edit an existing user group' do
     group = Users::Model::UserGroup[:name => 'Spec group']
     path  = Users::Controller::UserGroups.r(:edit, group.id).to_s
 
@@ -75,7 +78,7 @@ describe('Users::Controller::UserGroups') do
 
     current_path.should == path
 
-    within('#user_group_form') do
+    within '#user_group_form' do
       fill_in('name', :with => 'Spec group modified')
       check('permission_show_user')
       click_on(save_button)
@@ -88,11 +91,40 @@ describe('Users::Controller::UserGroups') do
     page.find('#permission_show_user').checked?.should == 'checked'
   end
 
-  it('Edit an existing user group with invalid data') do
+  enable_javascript
+
+  it 'Automatically save a user group' do
+    visit(index_url)
+    click_link('Spec group modified')
+
+    within '#user_group_form' do
+      fill_in('name', :with => 'Spec group autosave')
+    end
+
+    autosave_form('user_group_form')
+
+    visit(index_url)
+
+    page.has_content?('Spec group autosave')
+
+    click_link('Spec group autosave')
+
+    within '#user_group_form' do
+      fill_in('name', :with => 'Spec group modified')
+      click_on(save_button)
+    end
+
+    page.has_selector?('span.error').should      == false
+    page.find('input[name="name"]').value.should == 'Spec group modified'
+  end
+
+  disable_javascript
+
+  it 'Edit an existing user group with invalid data' do
     visit(index_url)
     click_link('Spec group')
 
-    within('#user_group_form') do
+    within '#user_group_form' do
       fill_in('name', :with => '')
       click_on(save_button)
     end
@@ -100,7 +132,7 @@ describe('Users::Controller::UserGroups') do
     page.has_selector?('label[for="form_name"] span.error').should == true
   end
 
-  it('Delete a group without an ID') do
+  it 'Delete a group without an ID' do
     visit(index_url)
     click_on(delete_button)
 
@@ -108,10 +140,10 @@ describe('Users::Controller::UserGroups') do
     page.all('table tbody tr').count.should                     == 2
   end
 
-  it('Delete an existing user group') do
+  it 'Delete an existing user group' do
     visit(index_url)
 
-    within('table tbody tr:last-child') do
+    within 'table tbody tr:last-child' do
       check('user_group_ids[]')
     end
 
@@ -120,7 +152,7 @@ describe('Users::Controller::UserGroups') do
     page.all('table tbody tr').count.should == 1
   end
 
-  it('Call the event new_user_group (before and after)') do
+  it 'Call the event new_user_group (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_new_user_group) do |user_group|
@@ -134,7 +166,7 @@ describe('Users::Controller::UserGroups') do
     visit(index_url)
     click_on(new_button)
 
-    within('#user_group_form') do
+    within '#user_group_form' do
       fill_in('name', :with => 'Group')
       choose('form_super_group_0')
       click_on(save_button)
@@ -147,7 +179,7 @@ describe('Users::Controller::UserGroups') do
     Zen::Event.delete(:before_new_user_group, :after_new_user_group)
   end
 
-  it('Call the event edit_user_group (before and after)') do
+  it 'Call the event edit_user_group (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_edit_user_group) do |user_group|
@@ -161,7 +193,7 @@ describe('Users::Controller::UserGroups') do
     visit(index_url)
     click_on('Group with event')
 
-    within('#user_group_form') do
+    within '#user_group_form' do
       click_on(save_button)
     end
 
@@ -172,7 +204,7 @@ describe('Users::Controller::UserGroups') do
     Zen::Event.delete(:before_edit_user_group, :after_edit_user_group)
   end
 
-  it('Call the event delete_user_group (before and after)') do
+  it 'Call the event delete_user_group (before and after)' do
     event_name  = nil
     event_name2 = nil
 
@@ -186,7 +218,7 @@ describe('Users::Controller::UserGroups') do
 
     visit(index_url)
 
-    within('table tbody tr:last-child') do
+    within 'table tbody tr:last-child' do
       check('user_group_ids[]')
     end
 

data/spec/zen/package/users/controller/users.rb

@@ -1,26 +1,17 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe("Users::Controller::Users") do
+describe "Users::Controller::Users" do
   behaves_like :capybara
 
   login_url     = Users::Controller::Users.r(:login).to_s
-  dashboard_url = Sections::Controller::Sections.r(:index).to_s
+  dashboard_url = Dashboard::Controller::Dashboard.r(:index).to_s
   index_url     = Users::Controller::Users.r(:index).to_s
   save_button   = lang('users.buttons.save')
   new_button    = lang('users.buttons.new')
   delete_button = lang('users.buttons.delete')
   status        = lang('users.special.status_hash.active')
 
-  it('Submit a form without a CSRF token') do
-    response = page.driver.post(
-      Users::Controller::Users.r(:save).to_s
-    )
-
-    response.body.include?(lang('zen_general.errors.csrf')).should == true
-    response.status.should                                         == 403
-  end
-
-  it('Show the login form') do
+  it 'Show the login form' do
     visit(login_url)
 
     page.has_selector?('#login_form').should                         == true
@@ -29,7 +20,7 @@ describe("Users::Controller::Users") do
     page.has_content?('Password').should                             == true
   end
 
-  it('Log in') do
+  it 'Log in' do
     event_email = nil
 
     Zen::Event.listen(:user_login) do |user|
@@ -38,7 +29,7 @@ describe("Users::Controller::Users") do
 
     visit(login_url)
 
-    within('#login_form') do
+    within '#login_form' do
       fill_in 'Email'   , :with => 'spec@domain.tld'
       fill_in 'Password', :with => 'spec'
       click_button 'Login'
@@ -48,7 +39,7 @@ describe("Users::Controller::Users") do
     event_email.should  == 'spec@domain.tld'
   end
 
-  it('Find an existing user') do
+  it 'Find an existing user' do
     message = lang('users.messages.no_users')
 
     visit(index_url)
@@ -57,11 +48,23 @@ describe("Users::Controller::Users") do
     page.has_content?(message).should           == false
   end
 
-  it("Create a new user") do
+  it 'Try to create a new user with a missing CSRF token' do
+    visit(index_url)
+    click_link(new_button)
+
+    within '#user_form' do
+      find('input[name="csrf_token"]').set('')
+      click_on(save_button)
+    end
+
+    page.has_content?(lang('zen_general.errors.csrf')).should == true
+  end
+
+  it "Create a new user" do
     visit(index_url)
     click_link(new_button)
 
-    within('#user_form') do
+    within '#user_form' do
       fill_in('name'   , :with => 'Spec user')
       fill_in('email'  , :with => 'spec@email.com')
       fill_in('website', :with => 'spec.com')
@@ -77,13 +80,13 @@ describe("Users::Controller::Users") do
     page.find('input[name="email"]').value.should == 'spec@email.com'
   end
 
-  it('Search for a user') do
+  it 'Search for a user' do
     search_button = lang('zen_general.buttons.search')
     error         = lang('zen_general.errors.invalid_search')
 
     visit(index_url)
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'Spec user')
       click_on(search_button)
     end
@@ -91,7 +94,7 @@ describe("Users::Controller::Users") do
     page.has_content?(error).should       == false
     page.has_content?('Spec user').should == true
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'does not exist')
       click_on(search_button)
     end
@@ -100,25 +103,61 @@ describe("Users::Controller::Users") do
     page.has_content?('Spec user').should == false
   end
 
-  it("Edit an existing user") do
+  it "Edit an existing user" do
     visit(index_url)
     click_link('Spec user')
 
-    within('#user_form') do
+    within '#user_form' do
       fill_in('name', :with => 'Spec user modified')
       check('permission_show_user')
+      check('form_user_group_pks_0')
+      click_on(save_button)
+    end
+
+    page.find('#permission_show_user').checked?.should  == 'checked'
+    page.find('#form_user_group_pks_0').checked?.should == 'checked'
+    page.find_field('name').value.should                == 'Spec user modified'
+
+    user  = Users::Model::User[:email => 'spec@email.com']
+    group = Users::Model::UserGroup[:slug => 'administrators']
+
+    user.user_group_pks.include?(group.id).should == true
+  end
+
+  enable_javascript
+
+  it 'Automatically save a user' do
+    visit(index_url)
+    click_link('Spec user modified')
+
+    within '#user_form' do
+      fill_in('name', :with => 'Spec user autosave')
+    end
+
+    autosave_form('user_form')
+
+    visit(index_url)
+
+    page.has_content?('Spec user autosave').should == true
+
+    click_link('Spec user autosave')
+
+    within '#user_form' do
+      fill_in('name', :with => 'Spec user modified')
       click_on(save_button)
     end
 
-    page.find('#permission_show_user').checked?.should == 'checked'
-    page.find_field('name').value.should               == 'Spec user modified'
+    page.has_selector?('span.error').should      == false
+    page.find('input[name="name"]').value.should == 'Spec user modified'
   end
 
-  it('Remove a permission from a user') do
+  disable_javascript
+
+  it 'Remove a permission from a user' do
     visit(index_url)
     click_link('Spec user')
 
-    within('#user_form') do
+    within '#user_form' do
       uncheck('permission_show_user')
       click_on(save_button)
     end
@@ -126,11 +165,11 @@ describe("Users::Controller::Users") do
     page.find('#permission_show_user').checked?.should != 'checked'
   end
 
-  it("Edit an existing user with invalid data") do
+  it "Edit an existing user with invalid data" do
     visit(index_url)
     click_link('Spec user')
 
-    within('#user_form') do
+    within '#user_form' do
       fill_in('form_name', :with => '')
       click_on(save_button)
     end
@@ -139,17 +178,17 @@ describe("Users::Controller::Users") do
     page.has_selector?('label[for="form_name"] span.error').should == true
   end
 
-  it("Delete an existing user without specifying an ID") do
+  it "Delete an existing user without specifying an ID" do
     visit(index_url)
     click_on(delete_button)
 
     page.has_selector?('input[name="user_ids[]"]').should == true
   end
 
-  it("Delete an existing user") do
+  it "Delete an existing user" do
     visit(index_url)
 
-    within('table tbody tr:last-child') do
+    within 'table tbody tr:last-child' do
       check('user_ids[]')
     end
 
@@ -158,7 +197,7 @@ describe("Users::Controller::Users") do
     page.has_content?('spec@email.com').should == false
   end
 
-  it('Call the event new_user (before and after)') do
+  it 'Call the event new_user (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_new_user) do |user|
@@ -172,7 +211,7 @@ describe("Users::Controller::Users") do
     visit(index_url)
     click_on(new_button)
 
-    within('#user_form') do
+    within '#user_form' do
       fill_in('name'   , :with => 'User')
       fill_in('email'  , :with => 'spec@email.com')
       fill_in('website', :with => 'spec.com')
@@ -189,7 +228,7 @@ describe("Users::Controller::Users") do
     Zen::Event.delete(:before_new_user, :after_new_user)
   end
 
-  it('Call the event edit_user (before and after)') do
+  it 'Call the event edit_user (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_edit_user) do |user|
@@ -203,7 +242,7 @@ describe("Users::Controller::Users") do
     visit(index_url)
     click_on('User with event')
 
-    within('#user_form') do
+    within '#user_form' do
       click_on(save_button)
     end
 
@@ -214,7 +253,7 @@ describe("Users::Controller::Users") do
     Zen::Event.delete(:before_edit_user, :after_edit_user)
   end
 
-  it('Call the event delete_user (before and after)') do
+  it 'Call the event delete_user (before and after)' do
     event_name  = nil
     event_name2 = nil
 
@@ -228,7 +267,7 @@ describe("Users::Controller::Users") do
 
     visit(index_url)
 
-    within('table tbody tr:last-child') do
+    within 'table tbody tr:last-child' do
       check('user_ids[]')
     end
 
@@ -241,7 +280,7 @@ describe("Users::Controller::Users") do
     Zen::Event.delete(:before_delete_user, :after_delete_user)
   end
 
-  it('Register a new user') do
+  it 'Register a new user' do
     get_setting(:allow_registration).value = '1'
 
     logout_path   = Users::Controller::Users.r(:logout).to_s
@@ -253,7 +292,7 @@ describe("Users::Controller::Users") do
 
     current_path.should == register_path
 
-    within('#register_form') do
+    within '#register_form' do
       fill_in('name', :with => 'New user')
       fill_in('email', :with => 'test@test.com')
       fill_in('password', :with => 'abc')
@@ -270,6 +309,46 @@ describe("Users::Controller::Users") do
     user.user_status.name.should == 'closed'
   end
 
+  it 'Allow users to edit their own account' do
+    user       = Users::Model::User[:email => 'test@test.com']
+    edit_url   = Users::Controller::Users.r(:edit, user.id).to_s
+    logout_url = Users::Controller::Users.r(:logout).to_s
+
+    user.activate!
+
+    visit(logout_url)
+    visit(Users::Controller::Users.r(:login).to_s)
+
+    # Log in as the user created in the previous tests.
+    within '#login_form' do
+      fill_in('Email', :with => 'test@test.com')
+      fill_in('Password', :with => 'abc')
+      click_button('Login')
+    end
+
+    visit(edit_url)
+
+    current_path.should == edit_url
+
+    within '#user_form' do
+      fill_in('name', :with => 'Modified user')
+      click_on(save_button)
+    end
+
+    user.reload
+
+    current_path.should                                         == edit_url
+    page.has_selector?('span.error').should                     == false
+    page.has_selector?('select[name="user_status_id"]').should  == false
+    page.has_selector?('input[name="user_group_pks[]"]').should == false
+
+    page.find('input[name="name"]').value.should == 'Modified user'
+    user.name.should                             == 'Modified user'
+    user.user_group_pks.empty?.should            == true
+
+    visit(logout_url)
+  end
+
   capybara_login
   Users::Model::User[:email => 'test@test.com'].destroy
 end