zen 0.3 → 0.4

data/spec/zen/package/comments/controller/comments_form.rb

@@ -1,8 +1,9 @@
 require File.expand_path('../../../../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'package/comments/controller/comments_form')
 
-describe("Comments::Controller::CommentsForm") do
+describe "Comments::Controller::CommentsForm" do
   behaves_like :capybara
+  WebMock.enable!
 
   before do
     get_setting(:defensio_key).value = 'test'
@@ -38,19 +39,22 @@ describe("Comments::Controller::CommentsForm") do
     :section_id              => section.id
   )
 
-  it('Submit a comment without a CSRF token') do
-    url      = Comments::Controller::CommentsForm.r(:save).to_s
-    response = page.driver.post(url)
+  it 'Try to submit a new comment with a missing CSRF token' do
+    visit(SpecCommentsForm.r(:index).to_s)
+
+    within '#spec_comments_form' do
+      find('input[name="csrf_token"]').set('')
+      click_on('Submit')
+    end
 
-    response.body.should   == lang('zen_general.errors.csrf')
-    response.status.should == 403
+    page.has_content?(lang('zen_general.errors.csrf')).should == true
   end
 
-  it('Submit a comment') do
+  it 'Submit a comment' do
     visit(SpecCommentsForm.r(:index).to_s)
 
     # Submit the form
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('user_id'      , :with => user_id)
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
@@ -68,7 +72,7 @@ describe("Comments::Controller::CommentsForm") do
     comment.section_entry_id  == section_entry.id
   end
 
-  it('Submit a comment with custom events') do
+  it 'Submit a comment with custom events' do
     event_comment = nil
 
     Zen::Event.listen(:before_new_comment) do |comment|
@@ -82,7 +86,7 @@ describe("Comments::Controller::CommentsForm") do
     visit(SpecCommentsForm.r(:index).to_s)
 
     # Submit the form
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -102,12 +106,12 @@ describe("Comments::Controller::CommentsForm") do
     event_comment.should     == 'Spec comment event'
   end
 
-  it('Fail to submit a comment with an invalid entry') do
+  it 'Fail to submit a comment with an invalid entry' do
     url = SpecCommentsForm.r(:index).to_s
 
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id + 1)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -123,7 +127,7 @@ describe("Comments::Controller::CommentsForm") do
     current_path.should == url
   end
 
-  it('Should fail to submit a comment for an invalid section') do
+  it 'Should fail to submit a comment for an invalid section' do
     old_id = section_entry.section_id
     url    = SpecCommentsForm.r(:index).to_s
 
@@ -131,7 +135,7 @@ describe("Comments::Controller::CommentsForm") do
 
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -149,13 +153,13 @@ describe("Comments::Controller::CommentsForm") do
     section_entry.update(:section_id => old_id)
   end
 
-  it('Should fail to submit a comment when comments are not allowed') do
+  it 'Should fail to submit a comment when comments are not allowed' do
     url = SpecCommentsForm.r(:index).to_s
 
     section.update(:comment_allow => false)
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'S)ec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -173,13 +177,13 @@ describe("Comments::Controller::CommentsForm") do
     section.update(:comment_allow => true)
   end
 
-  it('Fail to submit a comment when not logged in') do
+  it 'Fail to submit a comment when not logged in' do
     url = SpecCommentsForm.r(:index).to_s
 
     visit(Users::Controller::Users.r(:logout).to_s)
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -198,7 +202,7 @@ describe("Comments::Controller::CommentsForm") do
     capybara_login
   end
 
-  it('Submit a comment with moderation turned on') do
+  it 'Submit a comment with moderation turned on' do
     section.update(:comment_moderate => true)
 
     url           = SpecCommentsForm.r(:index).to_s
@@ -206,7 +210,7 @@ describe("Comments::Controller::CommentsForm") do
 
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -225,7 +229,7 @@ describe("Comments::Controller::CommentsForm") do
     section.update(:comment_moderate => false)
   end
 
-  it('Submit a comment and mark it as ham') do
+  it 'Submit a comment and mark it as ham' do
     yaml_response = <<-YAML.strip
     defensio-result:
       api-version: 2.0
@@ -250,7 +254,7 @@ describe("Comments::Controller::CommentsForm") do
 
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec alternative')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -270,7 +274,7 @@ describe("Comments::Controller::CommentsForm") do
     WebMock.reset!
   end
 
-  it('Submit a comment and mark it as ham with moderation turned on') do
+  it 'Submit a comment and mark it as ham with moderation turned on' do
     yaml_response = <<-YAML.strip
     defensio-result:
       api-version: 2.0
@@ -297,7 +301,7 @@ describe("Comments::Controller::CommentsForm") do
 
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec alternative')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -319,7 +323,7 @@ describe("Comments::Controller::CommentsForm") do
     section.update(:comment_moderate => false)
   end
 
-  it('Submit a comment and mark it as spam') do
+  it 'Submit a comment and mark it as spam' do
     yaml_response = <<-YAML.strip
     defensio-result:
       api-version: 2.0
@@ -344,7 +348,7 @@ describe("Comments::Controller::CommentsForm") do
 
     visit(url)
 
-    within('#spec_comments_form') do
+    within '#spec_comments_form' do
       fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec alternative')
       fill_in('website'      , :with => 'http://zen-cms.com/')
@@ -364,6 +368,7 @@ describe("Comments::Controller::CommentsForm") do
     WebMock.reset!
   end
 
+  WebMock.disable!
   section_entry.destroy
   section.destroy
 end

data/spec/zen/package/comments/helper/comment.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe('Ramaze::Helper::Comment') do
+describe 'Ramaze::Helper::Comment' do
   behaves_like :capybara
 
   user_id   = Users::Model::User[:email => 'spec@domain.tld'].id
@@ -27,7 +27,7 @@ describe('Ramaze::Helper::Comment') do
     :section_entry_id => entry.id
   )
 
-  it('Validate a valid comment') do
+  it 'Validate a valid comment' do
     url = Comments::Controller::Comments.r(:edit, comment.id).to_s
 
     visit(url)
@@ -35,7 +35,7 @@ describe('Ramaze::Helper::Comment') do
     current_path.should == url
   end
 
-  it('Validate an invalid comment') do
+  it 'Validate an invalid comment' do
     visit(Comments::Controller::Comments.r(:edit, comment.id + 100).to_s)
 
     current_path.should == Comments::Controller::Comments.r(:index).to_s

data/spec/zen/package/comments/helper/comment_frontend.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'package/comments/helper/comment_frontend')
 
-describe('Ramaze::Helper::CommentFrontend') do
+describe 'Ramaze::Helper::CommentFrontend' do
   behaves_like :capybara
 
   extend Ramaze::Helper::CommentFrontend
@@ -38,7 +38,7 @@ describe('Ramaze::Helper::CommentFrontend') do
     :email             => user.email
   )
 
-  it('Retrieve all comments for an ID') do
+  it 'Retrieve all comments for an ID' do
     comments = get_comments(entry.slug).all
 
     comments.count.should                                 == 2
@@ -48,7 +48,7 @@ describe('Ramaze::Helper::CommentFrontend') do
     comments[1].user.name.should                          == 'Spec'
   end
 
-  it('Retrieve all comments for a slug') do
+  it 'Retrieve all comments for a slug' do
     comments = get_comments(entry.id).all
 
     comments.count.should                                 == 2
@@ -56,7 +56,7 @@ describe('Ramaze::Helper::CommentFrontend') do
     comments[1].comment.include?('Spec comment 1').should == true
   end
 
-  it('Retrieve all comments and check the markup') do
+  it 'Retrieve all comments and check the markup' do
     comments = get_comments(entry.id).all
 
     comments.count.should                 == 2
@@ -64,14 +64,14 @@ describe('Ramaze::Helper::CommentFrontend') do
     comments[1].html.strip.should == '<p>Spec comment 1</p>'
   end
 
-  it('Retrieve a single comment') do
+  it 'Retrieve a single comment' do
     comments = get_comments(entry.id, :limit => 1).all
 
     comments.count.should                               == 1
     comments[0].comment.include?('Spec comment').should == true
   end
 
-  it('Paginate a set of comments') do
+  it 'Paginate a set of comments' do
     visit('/spec-comment-frontend')
 
     page.has_selector?('p').should         == true

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

@@ -1,9 +1,9 @@
 require File.expand_path('../../../../helper', __FILE__)
 
-describe('CustomFields::BlueFormParameters') do
+describe 'CustomFields::BlueFormParameters' do
   behaves_like :capybara
 
-  it('Generate the parameters for input_text()') do
+  it 'Generate the parameters for input_text()' do
     stubbed = stub_custom_field('textbox')
     params  = CustomFields::BlueFormParameters.input_text(
       stubbed[:custom_field],
@@ -21,7 +21,7 @@ describe('CustomFields::BlueFormParameters') do
     params[3].key?(:class).should    == false
   end
 
-  it('Generate the parameters for input_password()') do
+  it 'Generate the parameters for input_password()' do
     stubbed = stub_custom_field('password')
     params  = CustomFields::BlueFormParameters.input_password(
       stubbed[:custom_field],
@@ -36,7 +36,7 @@ describe('CustomFields::BlueFormParameters') do
     params[3].key?(:'data-format').should == false
   end
 
-  it('Generate the parameters for textarea()') do
+  it 'Generate the parameters for textarea()' do
     stubbed = stub_custom_field(
       'textarea',
       :text_editor   => true,
@@ -66,7 +66,7 @@ describe('CustomFields::BlueFormParameters') do
     params[3][:class].empty?.should == true
   end
 
-  it('Generate the parameters for input_radio()') do
+  it 'Generate the parameters for input_radio()' do
     stubbed = stub_custom_field(
       'radio',
       :possible_values => "ruby|Ruby\npython|Python"
@@ -101,7 +101,7 @@ describe('CustomFields::BlueFormParameters') do
     params[4][:values]['python'].should == 'python'
   end
 
-  it('Generate the parameters for input_checkbox()') do
+  it 'Generate the parameters for input_checkbox()' do
     stubbed = stub_custom_field(
       'checkbox',
       :possible_values => "ruby|Ruby\npython|Python"
@@ -123,7 +123,7 @@ describe('CustomFields::BlueFormParameters') do
     params[3].include?('Python').should == true
   end
 
-  it('Generate the parameters for select()') do
+  it 'Generate the parameters for select()' do
     stubbed = stub_custom_field(
       'select',
       :possible_values => "ruby|Ruby\npython|Python"
@@ -158,7 +158,7 @@ describe('CustomFields::BlueFormParameters') do
     params[3][:values]['python'].should == 'python'
   end
 
-  it('Generate the parameters for select_multiple()') do
+  it 'Generate the parameters for select_multiple()' do
     stubbed = stub_custom_field(
       'select_multiple',
       :possible_values => "ruby|Ruby\npython|Python"

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

@@ -1,6 +1,6 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe('CustomFields::Controller::CustomFieldGroups') do
+describe 'CustomFields::Controller::CustomFieldGroups' do
   behaves_like :capybara
 
   index_url     = CustomFields::Controller::CustomFieldGroups.r(:index).to_s
@@ -10,16 +10,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
   delete_button = lang('custom_field_groups.buttons.delete')
   new_button    = lang('custom_field_groups.buttons.new')
 
-  it('Submit a form without a CSRF token') do
-    response = page.driver.post(
-      CustomFields::Controller::CustomFieldGroups.r(:save).to_s
-    )
-
-    response.body.include?(lang('zen_general.errors.csrf')).should == true
-    response.status.should                                         == 403
-  end
-
-  it('Find no existing field groups') do
+  it 'Find no existing field groups' do
     message = lang('custom_field_groups.messages.no_groups')
 
     visit(index_url)
@@ -31,13 +22,24 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.has_content?(message).should           == true
   end
 
-  it('Create a new group') do
+  it 'Try to create a new custom field group with a missing CSRF token' do
+    visit(new_url)
+
+    within '#custom_field_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 group' do
     visit(index_url)
     click_link(new_button)
 
     current_path.should == new_url
 
-    within('#custom_field_group_form') do
+    within '#custom_field_group_form' do
       fill_in('name'       , :with => 'Spec field group')
       fill_in('description', :with => 'Spec field group desc')
       click_on(save_button)
@@ -51,13 +53,13 @@ describe('CustomFields::Controller::CustomFieldGroups') do
       .value.should == 'Spec field group desc'
   end
 
-  it('Search for a custom field group') do
+  it 'Search for a custom field 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 field group')
       click_on(search_button)
     end
@@ -65,7 +67,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.has_content?(error).should              == false
     page.has_content?('Spec field group').should == true
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'does not exist')
       click_on(search_button)
     end
@@ -74,14 +76,14 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.has_content?('Spec field group').should == false
   end
 
-  it("Edit an existing group") do
+  it "Edit an existing group" do
     visit(index_url)
     click_link('Spec field group')
 
     current_path.should =~ /#{edit_url}\/[0-9]+/
 
     # Update the details
-    within('#custom_field_group_form') do
+    within '#custom_field_group_form' do
       fill_in('name', :with => 'Spec field group modified')
       click_on(save_button)
     end
@@ -89,14 +91,43 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.find('input[name="name"]').value.should == 'Spec field group modified'
   end
 
-  it("Fail to edit an existing group with invalid data") do
+  enable_javascript
+
+  it 'Automatically save a custom field group' do
+    visit(index_url)
+    click_link('Spec field group modified')
+
+    within '#custom_field_group_form' do
+      fill_in('name', :with => 'Spec field group autosave')
+    end
+
+    autosave_form('custom_field_group_form')
+
+    visit(index_url)
+
+    page.has_content?('Spec field group autosave').should == true
+
+    click_link('Spec field group autosave')
+
+    within '#custom_field_group_form' do
+      fill_in('name', :with => 'Spec field group modified')
+      click_on(save_button)
+    end
+
+    page.has_selector?('span.error').should      == false
+    page.find('input[name="name"]').value.should == 'Spec field group modified'
+  end
+
+  disable_javascript
+
+  it "Fail to edit an existing group with invalid data" do
     visit(index_url)
     click_link('Spec field group')
 
     current_path.should =~ /#{edit_url}\/[0-9]+/
 
     # Update the details
-    within('#custom_field_group_form') do
+    within '#custom_field_group_form' do
       fill_in('name', :with => '')
       click_on(save_button)
     end
@@ -104,7 +135,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.has_selector?('span.error').should == true
   end
 
-  it("Fail to delete a group without an ID") do
+  it "Fail to delete a group without an ID" do
     message = lang('custom_field_groups.messages.no_groups')
 
     visit(index_url)
@@ -113,7 +144,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.has_selector?('input[name="custom_field_group_ids[]"]') .should == true
   end
 
-  it("Delete an existing group") do
+  it "Delete an existing group" do
     message = lang('custom_field_groups.messages.no_groups')
 
     visit(index_url)
@@ -125,7 +156,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     page.has_content?(message).should           == true
   end
 
-  it('Call the event new_custom_field_group (before and after)') do
+  it 'Call the event new_custom_field_group (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_new_custom_field_group) do |group|
@@ -139,7 +170,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     visit(index_url)
     click_on(new_button)
 
-    within('#custom_field_group_form') do
+    within '#custom_field_group_form' do
       fill_in('name', :with => 'Field group')
       click_on(save_button)
     end
@@ -154,7 +185,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     )
   end
 
-  it('Call the event edit_custom_field_group (before and after)') do
+  it 'Call the event edit_custom_field_group (before and after)' do
     event_name = nil
 
     Zen::Event.listen(:before_edit_custom_field_group) do |group|
@@ -168,7 +199,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     visit(index_url)
     click_on('Field group with event')
 
-    within('#custom_field_group_form') do
+    within '#custom_field_group_form' do
       click_on(save_button)
     end
 
@@ -182,7 +213,7 @@ describe('CustomFields::Controller::CustomFieldGroups') do
     )
   end
 
-  it('Call the event delete_custom_field_group (before and after)') do
+  it 'Call the event delete_custom_field_group (before and after)' do
     event_name  = nil
     event_name2 = nil
     message     = lang('custom_field_groups.messages.no_groups')