zen 0.3 → 0.4

data/spec/zen/package/custom_fields/controller/custom_field_types.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe('CustomFields::Controller::CustomFieldTypes') do
+describe 'CustomFields::Controller::CustomFieldTypes' do
   behaves_like :capybara
 
   index_url     = CustomFields::Controller::CustomFieldTypes.r(:index).to_s
@@ -10,16 +10,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
   save_button   = lang('custom_field_types.buttons.save')
   delete_button = lang('custom_field_types.buttons.delete')
 
-  it('Submit a form without a CSRF token') do
-    response = page.driver.post(
-      CustomFields::Controller::CustomFieldTypes.r(:save).to_s
-    )
-
-    response.body.include?(lang('zen_general.errors.csrf')).should == true
-    response.status.should                                         == 403
-  end
-
-  it('Find a number of field types') do
+  it 'Find a number of field types' do
     message = lang('custom_field_types.messages.no_field_types')
     rows    = CustomFields::Model::CustomFieldType.count
 
@@ -31,7 +22,18 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.all('table tbody tr').count.should      == rows
   end
 
-  it('Create a new custom field type') do
+  it 'Try to create a new custom field type with a missing CSRF token' do
+    visit(new_url)
+
+    within '#custom_field_type_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 custom field type' do
     method_id = CustomFields::Model::CustomFieldMethod[
       :name => 'input_text'
     ].id.to_s
@@ -42,7 +44,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     current_path.should == new_url
 
     # Submit the form
-    within('#custom_field_type_form') do
+    within '#custom_field_type_form' do
       # Fill in various text fields
       fill_in('form_name', :with => 'Spec type')
 
@@ -77,13 +79,13 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.find_field('form_custom_field_method_id').value.should == method_id
   end
 
-  it('Search for a custom field type') do
+  it 'Search for a custom field type' 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 type')
       click_on(search_button)
     end
@@ -91,7 +93,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.has_content?(error).should       == false
     page.has_content?('Spec type').should == true
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'does not exist')
       click_on(search_button)
     end
@@ -100,7 +102,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.has_content?('Spec type').should == false
   end
 
-  it('Edit a custom field type') do
+  it 'Edit a custom field type' do
     method_id = CustomFields::Model::CustomFieldMethod[
       :name => 'textarea'
     ].id.to_s
@@ -111,7 +113,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     current_path.should =~ /#{edit_url}\/\d+/
 
     # Update the form
-    within('#custom_field_type_form') do
+    within '#custom_field_type_form' do
       fill_in('form_name', :with => 'Spec type modified')
 
       fill_in(
@@ -137,13 +139,41 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.find_field('custom_field_method_id').value.should == method_id
   end
 
-  it('Edit a custom field type with invalid data') do
+  enable_javascript
+
+  it 'Automatically save a custom field type' do
+    visit(index_url)
+    click_link('Spec type modified')
+
+    within '#custom_field_type_form' do
+      fill_in('name', :with => 'Spec type autosave')
+    end
+
+    autosave_form('custom_field_type_form')
+
+    visit(index_url)
+
+    page.has_content?('Spec type autosave').should == true
+    click_link('Spec type autosave')
+
+    within '#custom_field_type_form' do
+      fill_in('name', :with => 'Spec type modified')
+      click_on(save_button)
+    end
+
+    page.has_selector?('span.error').should      == false
+    page.find('input[name="name"]').value.should == 'Spec type modified'
+  end
+
+  disable_javascript
+
+  it 'Edit a custom field type with invalid data' do
     visit(index_url)
     click_link('Spec type')
 
     current_path.should =~ /#{edit_url}\/\d+/
 
-    within('#custom_field_type_form') do
+    within '#custom_field_type_form' do
       fill_in('form_name', :with => '')
       click_on(save_button)
     end
@@ -151,7 +181,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.has_selector?('span.error').should == true
   end
 
-  it('Fail to delete a field type without an ID') do
+  it 'Fail to delete a field type without an ID' do
     type_id = CustomFields::Model::CustomFieldType[
       :name => 'Spec type modified'
     ].id
@@ -163,7 +193,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
       .should == true
   end
 
-  it('Delete a custom field type') do
+  it 'Delete a custom field type' do
     rows    = CustomFields::Model::CustomFieldType.count - 1
     type_id = CustomFields::Model::CustomFieldType[
       :name => 'Spec type modified'
@@ -180,7 +210,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     page.all('table tbody tr').count.should        == rows
   end
 
-  it('Call the event new_custom_field_type (before and after)') do
+  it 'Call the event new_custom_field_type (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_new_custom_field_type) do |type|
@@ -194,7 +224,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     visit(index_url)
     click_on(new_button)
 
-    within('#custom_field_type_form') do
+    within '#custom_field_type_form' do
       fill_in('form_name', :with => 'Field type')
 
       fill_in(
@@ -216,7 +246,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     )
   end
 
-  it('Call the event edit_custom_field_type (before and after)') do
+  it 'Call the event edit_custom_field_type (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_edit_custom_field_type) do |type|
@@ -230,7 +260,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     visit(index_url)
     click_on('Field type with event')
 
-    within('#custom_field_type_form') do
+    within '#custom_field_type_form' do
       click_on(save_button)
     end
 
@@ -243,7 +273,7 @@ describe('CustomFields::Controller::CustomFieldTypes') do
     )
   end
 
-  it('Call the event delete_custom_field_type (before and after)') do
+  it 'Call the event delete_custom_field_type (before and after)' do
     event_name  = nil
     event_name2 = nil
     type_id     = CustomFields::Model::CustomFieldType[

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

@@ -1,6 +1,6 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe('CustomFields::Controller::CustomFields') do
+describe 'CustomFields::Controller::CustomFields' do
   behaves_like :capybara
 
   group = CustomFields::Model::CustomFieldGroup.create(
@@ -13,16 +13,7 @@ describe('CustomFields::Controller::CustomFields') do
   save_button   = lang('custom_fields.buttons.save')
   delete_button = lang('custom_fields.buttons.delete')
 
-  it('Submit a form without a CSRF token') do
-    response = page.driver.post(
-      CustomFields::Controller::CustomFields.r(:save).to_s
-    )
-
-    response.body.include?(lang('zen_general.errors.csrf')).should == true
-    response.status.should                                         == 403
-  end
-
-  it('Find no existing fields') do
+  it 'Find no existing fields' do
     message = lang('custom_fields.messages.no_fields')
 
     visit(index_url)
@@ -31,7 +22,19 @@ describe('CustomFields::Controller::CustomFields') do
     page.has_content?(message).should           == true
   end
 
-  it("Create a new custom field") do
+  it 'Try to create a new custom field with a missing CSRF token' do
+    visit(index_url)
+    click_link(new_button)
+
+    within '#custom_field_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 custom field" do
     type_select   = lang('custom_fields.special.type_hash.textbox')
     format_select = lang('zen_general.markup.markdown')
     textbox_field = CustomFields::Model::CustomFieldType[:name => 'textbox']
@@ -39,7 +42,7 @@ describe('CustomFields::Controller::CustomFields') do
     visit(index_url)
     click_link(new_button)
 
-    within('#custom_field_form') do
+    within '#custom_field_form' do
       fill_in('form_name', :with => 'Spec field')
 
       # Set the type to a textbox
@@ -72,13 +75,13 @@ describe('CustomFields::Controller::CustomFields') do
     page.find_field('form_sort_order').value.should      == '2'
   end
 
-  it('Search for a custom field') do
+  it 'Search for a custom field' 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 field')
       click_on(search_button)
     end
@@ -86,7 +89,7 @@ describe('CustomFields::Controller::CustomFields') do
     page.has_content?(error).should        == false
     page.has_content?('Spec field').should == true
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'does not exist')
       click_on(search_button)
     end
@@ -95,7 +98,7 @@ describe('CustomFields::Controller::CustomFields') do
     page.has_content?('Spec field').should == false
   end
 
-  it("Edit an existing custom field") do
+  it "Edit an existing custom field" do
     type_select    = lang('custom_fields.special.type_hash.textarea')
     textarea_field = CustomFields::Model::CustomFieldType[:name => 'textarea']
 
@@ -103,7 +106,7 @@ describe('CustomFields::Controller::CustomFields') do
     click_link('Spec field')
 
     # Update the form
-    within('#custom_field_form') do
+    within '#custom_field_form' do
       fill_in('form_name', :with => 'Spec field modified')
 
       # Change the field type to a textarea
@@ -126,11 +129,39 @@ describe('CustomFields::Controller::CustomFields') do
       .value.should == textarea_field.id.to_s
   end
 
-  it("Edit an existing custom field with invalid data") do
+  enable_javascript
+
+  it 'Automatically save a custom field' do
+    visit(index_url)
+    click_link('Spec field modified')
+
+    within '#custom_field_form' do
+      fill_in('name', :with => 'Spec field autosave')
+    end
+
+    autosave_form('custom_field_form')
+
+    visit(index_url)
+
+    page.has_content?('Spec field autosave')
+    click_link('Spec field autosave')
+
+    within '#custom_field_form' do
+      fill_in('name', :with => 'Spec field modified')
+      click_on(save_button)
+    end
+
+    page.has_selector?('span.error').should      == false
+    page.find('input[name="name"]').value.should == 'Spec field modified'
+  end
+
+  disable_javascript
+
+  it "Edit an existing custom field with invalid data" do
     visit(index_url)
     click_link('Spec field')
 
-    within('#custom_field_form') do
+    within '#custom_field_form' do
       fill_in('form_name', :with => '')
       click_on(save_button)
     end
@@ -138,7 +169,7 @@ describe('CustomFields::Controller::CustomFields') do
     page.has_selector?('span.error').should == true
   end
 
-  it('Fail to delete a field without an ID') do
+  it 'Fail to delete a field without an ID' do
     message = lang('custom_fields.messages.no_fields')
 
     visit(index_url)
@@ -147,7 +178,7 @@ describe('CustomFields::Controller::CustomFields') do
     page.has_selector?('input[name="custom_field_ids[]"]').should == true
   end
 
-  it("Delete an existing custom field") do
+  it "Delete an existing custom field" do
     message = lang('custom_fields.messages.no_fields')
 
     visit(index_url)
@@ -158,7 +189,7 @@ describe('CustomFields::Controller::CustomFields') do
     page.has_content?(message).should           == true
   end
 
-  it('Call the event new_custom_field (before and after)') do
+  it 'Call the event new_custom_field (before and after)' do
     event_name  = nil
     type_select = lang('custom_fields.special.type_hash.textarea')
 
@@ -173,7 +204,7 @@ describe('CustomFields::Controller::CustomFields') do
     visit(index_url)
     click_on(new_button)
 
-    within('#custom_field_form') do
+    within '#custom_field_form' do
       fill_in('form_name', :with => 'Custom field')
       select(type_select, :from => 'form_custom_field_type_id')
       click_on(save_button)
@@ -186,7 +217,7 @@ describe('CustomFields::Controller::CustomFields') do
     Zen::Event.delete(:before_new_custom_field, :after_new_custom_field)
   end
 
-  it('Call the event edit_custom_field (before and after)') do
+  it 'Call the event edit_custom_field (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_edit_custom_field) do |field|
@@ -200,7 +231,7 @@ describe('CustomFields::Controller::CustomFields') do
     visit(index_url)
     click_on('Custom field with event')
 
-    within('#custom_field_form') do
+    within '#custom_field_form' do
       click_on(save_button)
     end
 
@@ -210,7 +241,7 @@ describe('CustomFields::Controller::CustomFields') do
     Zen::Event.delete(:before_edit_custom_field, :after_edit_custom_field)
   end
 
-  it('Call the event delete_custom_field (before and after)') do
+  it 'Call the event delete_custom_field (before and after)' do
     event_name  = nil
     event_name2 = nil
 

data/spec/zen/package/custom_fields/helper/custom_field.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe('Ramaze::Helper::CustomField') do
+describe 'Ramaze::Helper::CustomField' do
   behaves_like :capybara
 
   type   = CustomFields::Model::CustomFieldType[:name => 'textbox']
@@ -20,7 +20,7 @@ describe('Ramaze::Helper::CustomField') do
   @group.name.should == 'Spec group'
   @field.name.should == 'Spec field'
 
-  it('Validate a valid custom field group') do
+  it 'Validate a valid custom field group' do
     url = CustomFields::Controller::CustomFieldGroups.r(:edit, @group.id).to_s
 
     visit(url)
@@ -28,7 +28,7 @@ describe('Ramaze::Helper::CustomField') do
     current_path.should == url
   end
 
-  it('Validate an invalid custom field group') do
+  it 'Validate an invalid custom field group' do
     url   = CustomFields::Controller::CustomFieldGroups \
       .r(:edit, @group.id + 1).to_s
 
@@ -40,7 +40,7 @@ describe('Ramaze::Helper::CustomField') do
     current_path.should == index
   end
 
-  it('Validate a valid custom field') do
+  it 'Validate a valid custom field' do
     url = CustomFields::Controller::CustomFields \
       .r(:edit, @group.id, @field.id).to_s
 
@@ -49,7 +49,7 @@ describe('Ramaze::Helper::CustomField') do
     current_path.should == url
   end
 
-  it('Validate an invalid custom field') do
+  it 'Validate an invalid custom field' do
     url = CustomFields::Controller::CustomFields \
       .r(:edit, @group.id, @field.id + 1).to_s
 
@@ -60,7 +60,7 @@ describe('Ramaze::Helper::CustomField') do
     current_path.should == index
   end
 
-  it('Validate a valid custom field type') do
+  it 'Validate a valid custom field type' do
     type = CustomFields::Model::CustomFieldType[:name => 'textbox']
     url  = CustomFields::Controller::CustomFieldTypes.r(:edit, type.id).to_s
 
@@ -69,7 +69,7 @@ describe('Ramaze::Helper::CustomField') do
     current_path.should == url
   end
 
-  it('Validate an invalid custom field type') do
+  it 'Validate an invalid custom field type' do
     type = CustomFields::Model::CustomFieldType[:name => 'textbox']
 
     visit(