zen 0.2.8 → 0.3b

data/spec/zen/package/categories/helper/category_frontend.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../../../../../helper', __FILE__)
+require File.join(Zen::FIXTURES, 'package/categories/helper/category_frontend')
+
+describe('Ramaze::Helper::CategoryFrontend') do
+  behaves_like :capybara
+
+  extend Ramaze::Helper::CategoryFrontend
+
+  category_group = ::Categories::Model::CategoryGroup.create(
+    :name => 'Spec group'
+  )
+
+  category1 = ::Categories::Model::Category.create(
+    :name              => 'Spec category',
+    :category_group_id => category_group.id
+  )
+
+  category2 = ::Categories::Model::Category.create(
+    :name              => 'Spec category 2',
+    :category_group_id => category_group.id
+  )
+
+  it('Retrieve categories for a group ID') do
+    categories = get_categories(category_group.id).all
+
+    categories.length.should   == 2
+    categories[0].name.should  == category1.name
+  end
+
+  it('Retrieve categories for a group slug') do
+    categories = get_categories(category_group.name).all
+
+    categories.length.should   == 2
+    categories[0].name.should  == category1.name
+  end
+
+  it('Limit the amount of results') do
+    categories = get_categories(category_group.id, :limit => 1).all
+
+    categories.length.should  == 1
+    categories[0].name.should == category1.name
+  end
+
+  it('Retrieve and paginate two categories') do
+    visit('/spec-category-frontend')
+
+    page.has_selector?('p').should          == true
+    page.find('p:first-child').text.should  == category1.name
+    page.has_selector?('.pager').should     == true
+
+    visit('/spec-category-frontend?page=2')
+
+    page.has_selector?('p').should          == true
+    page.find('p:first-child').text.should  == category2.name
+    page.has_selector?('.pager').should     == true
+  end
+
+  category1.destroy
+  category2.destroy
+  category_group.destroy
+end

data/spec/zen/package/comments/anti_spam.rb

@@ -0,0 +1,50 @@
+require File.expand_path('../../../../helper', __FILE__)
+
+describe('Comments::AntiSpam') do
+  behaves_like :capybara
+
+  spam_comment = 'Hello, you can buy viagra here ' \
+    '<a href="http://buyviagra.com/">Buy Viagra</a>'
+
+  yaml_response = <<-YAML.strip
+  defensio-result:
+    api-version: 2.0
+    status: success
+    message:
+    signature: 1234abc
+    allow: false
+    classification: spam
+    spaminess: 0.9
+    profanity-match: false
+  YAML
+
+  stub_request(
+    :post,
+    'http://api.defensio.com/2.0/users/test/documents.yaml'
+  ).to_return(:body => yaml_response)
+
+  it('Fail to use an invalid engine') do
+    should.raise?(ArgumentError) do
+      Comments::AntiSpam.validate(:foobar, nil, nil, nil, spam_comment)
+    end
+  end
+
+  it('Validate a spam comment using Defensio') do
+    get_setting(:defensio_key).value = 'test'
+
+    Comments::AntiSpam.validate(:defensio, nil, nil, nil, spam_comment) \
+      .should == true
+  end
+
+  it('Fail to validate using defensio without an API key') do
+    get_setting(:defensio_key).value = nil
+
+    should.raise? do
+      Comments::AntiSpam.validate(:defensio, nil, nil, nil, spam_comment)
+    end
+
+    get_setting(:defensio_key).value = 'test'
+  end
+
+  WebMock.reset!
+end

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

@@ -1,26 +1,33 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe("Comments::Controller::Comments") do
+describe('Comments::Controller::Comments') do
   behaves_like :capybara
 
-  it("Create all test data") do
-    @section = Sections::Model::Section.create(
-      :name                    => 'Spec section',
-      :comment_allow           => true,
-      :comment_require_account => false,
-      :comment_moderate        => false,
-      :comment_format          => 'markdown'
+  index_url   = Comments::Controller::Comments.r(:index).to_s
+  edit_url    = Comments::Controller::Comments.r(:edit).to_s
+  save_button = lang('comments.buttons.save')
+  user_id     = Users::Model::User[:email => 'spec@domain.tld'].id
+  section     = Sections::Model::Section.create(
+    :name                    => 'Spec section',
+    :comment_allow           => true,
+    :comment_require_account => false,
+    :comment_moderate        => false,
+    :comment_format          => 'markdown'
+  )
+
+  entry = Sections::Model::SectionEntry.create(
+    :title      => 'Spec entry',
+    :user_id    => user_id,
+    :section_id => section.id
+  )
+
+  after do
+    Zen::Event.delete(
+      :before_edit_comment,
+      :after_edit_comment,
+      :before_delete_comment,
+      :after_delete_comment
     )
-
-    @entry = Sections::Model::SectionEntry.create(
-      :title      => 'Spec entry',
-      :status     => 'published',
-      :user_id    => 1,
-      :section_id => @section.id
-    )
-
-    @section.name.should === 'Spec section'
-    @entry.title.should  === 'Spec entry'
   end
 
   it('Submit a form without a CSRF token') do
@@ -28,41 +35,77 @@ describe("Comments::Controller::Comments") do
       Comments::Controller::Comments.r(:save).to_s
     )
 
-    response.body.include?(lang('zen_general.errors.csrf')).should === true
-    response.status.should                                         === 403
+    response.body.include?(lang('zen_general.errors.csrf')).should == true
+    response.status.should                                         == 403
   end
 
-  it("No comments should exist") do
-    index_url = Comments::Controller::Comments.r(:index).to_s
-    message   = lang('comments.messages.no_comments')
+  it('Find no existing comments') do
+    message = lang('comments.messages.no_comments')
 
     visit(index_url)
 
-    page.has_content?(message).should           === true
-    page.has_selector?('table tbody tr').should === false
+    page.has_content?(message).should           == true
+    page.has_selector?('table tbody tr').should == false
   end
 
-  it("Create a new comment") do
+  it('Create a new comment') do
     comment = Comments::Model::Comment.create(
       :user_id          => 1,
-      :section_entry_id => @entry.id,
+      :section_entry_id => entry.id,
       :email            => 'spec@domain.tld',
       :comment          => 'Spec comment'
     )
 
-    index_url = Comments::Controller::Comments.r(:index).to_s
-    message   = lang('comments.messages.no_comments')
+    message = lang('comments.messages.no_comments')
 
     visit(index_url)
 
-    page.has_content?(message).should           === false
-    page.has_selector?('table tbody tr').should === true
+    page.has_content?(message).should           == false
+    page.has_selector?('table tbody tr').should == true
+  end
+
+  it('Search for a comment') do
+    visit(index_url)
+    search_button = lang('zen_general.buttons.search')
+    error         = lang('zen_general.errors.invalid_search')
+
+    within('#search_form') do
+      fill_in('query', :with => 'Spec comment')
+      click_on(search_button)
+    end
+
+    page.has_content?(error).should          == false
+    page.has_content?('Spec comment').should == true
+
+    within('#search_form') do
+      fill_in('query', :with => 'spec@domain.tld')
+      click_on(search_button)
+    end
+
+    page.has_content?(error).should          == false
+    page.has_content?('Spec comment').should == true
+
+    within('#search_form') do
+      fill_in('query', :with => 'does not exist')
+      click_on(search_button)
+    end
+
+    page.has_content?(error).should          == false
+    page.has_content?('Spec comment').should == false
   end
 
-  it("Edit an existing comment") do
-    index_url   = Comments::Controller::Comments.r(:index).to_s
-    edit_url    = Comments::Controller::Comments.r(:edit).to_s
-    save_button = lang('comments.buttons.save')
+  it('Edit an existing comment') do
+    event_comment  = nil
+    event_comment2 = nil
+    comment        = 'Spec modified 123'
+
+    Zen::Event.listen(:before_edit_comment) do |comment|
+      event_comment = comment.comment
+    end
+
+    Zen::Event.listen(:after_edit_comment) do |comment|
+      event_comment2 = comment.comment
+    end
 
     visit(index_url)
     click_link('Spec comment')
@@ -70,23 +113,35 @@ describe("Comments::Controller::Comments") do
     current_path.should =~ /#{edit_url}\/[0-9]+/
 
     within('#comment_form') do
-      fill_in('comment', :with => 'Spec comment modified')
+      fill_in('comment', :with => comment)
       select(lang('comments.labels.open'), :from => 'comment_status_id')
       click_on(save_button)
     end
 
-    page.find('textarea[name="comment"]').value \
-      .should === 'Spec comment modified'
+    page.find('textarea[name="comment"]').value.should == comment
 
     page.find('select[name="comment_status_id"] option[selected]').text \
-      .should === lang('comments.labels.open')
-  end
+      .should == lang('comments.labels.open')
+
+    event_comment.should  == comment
+    event_comment2.should == event_comment
+
+    Zen::Event.delete(:before_edit_comment, :after_edit_comment)
+
+    # Modify the comment using an event
+    Zen::Event.listen(:before_edit_comment) do |comment|
+      comment.comment = 'Spec comment modified'
+    end
+
+    within('#comment_form') do
+      click_on(save_button)
+    end
 
-  it("Edit an existing comment with invalid data") do
-    index_url   = Comments::Controller::Comments.r(:index).to_s
-    edit_url    = Comments::Controller::Comments.r(:edit).to_s
-    save_button = lang('comments.buttons.save')
+    page.find('textarea[name="comment"]') \
+      .value.should == 'Spec comment modified'
+  end
 
+  it('Edit an existing comment with invalid data') do
     visit(index_url)
     click_link('Spec comment')
 
@@ -97,38 +152,43 @@ describe("Comments::Controller::Comments") do
       click_on(save_button)
     end
 
-    page.has_selector?('span.error').should === true
+    page.has_selector?('span.error').should == true
   end
 
-  it('Try to delete a set of comments without IDs') do
-    index_url     = Comments::Controller::Comments.r(:index).to_s
+  it('Fail to delete a set of comments without IDs') do
     delete_button = lang('comments.buttons.delete')
 
     visit(index_url)
     click_on(delete_button)
 
-    page.has_selector?('input[name="comment_ids[]"]').should === true
+    page.has_selector?('input[name="comment_ids[]"]').should == true
   end
 
-  it("Delete an existing comment") do
-    index_url     = Comments::Controller::Comments.r(:index).to_s
-    delete_button = lang('comments.buttons.delete')
-    message       = lang('comments.messages.no_comments')
+  it('Delete an existing comment') do
+    delete_button  = lang('comments.buttons.delete')
+    message        = lang('comments.messages.no_comments')
+    event_comment  = nil
+    event_comment2 = nil
+
+    Zen::Event.listen(:before_delete_comment) do |comment|
+      event_comment = comment.comment
+    end
+
+    Zen::Event.listen(:after_delete_comment) do |comment|
+      event_comment2 = comment.comment
+    end
 
     visit(index_url)
     check('comment_ids[]')
     click_on(delete_button)
 
-    page.has_content?(message).should           === true
-    page.has_selector?('table tbody tr').should === false
-  end
-
-  it("Delete all test data") do
-    @entry.destroy
-    @section.destroy
+    page.has_content?(message).should           == true
+    page.has_selector?('table tbody tr').should == false
 
-    Sections::Model::Section.filter[:name => 'Spec section'].should     === nil
-    Sections::Model::SectionEntry.filter[:title => 'Spec entry'].should === nil
+    event_comment.should  == 'Spec comment modified'
+    event_comment2.should == event_comment
   end
 
+  entry.destroy
+  section.destroy
 end

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

@@ -1,41 +1,49 @@
 require File.expand_path('../../../../../helper', __FILE__)
-require File.join(Zen::Fixtures, 'package/comments/controller/comments_form')
+require File.join(Zen::FIXTURES, 'package/comments/controller/comments_form')
 
 describe("Comments::Controller::CommentsForm") do
   behaves_like :capybara
 
   before do
-    plugin(:settings, :get, :defensio_key).value = 'test'
+    get_setting(:defensio_key).value = 'test'
   end
 
   after do
     Comments::Model::Comment.destroy
-    plugin(:settings, :get, :defensio_key).value = nil
+
+    get_setting(:defensio_key).value = nil
+
+    Zen::Event.delete(:before_new_comment, :after_new_comment)
   end
 
-  it('Create the test data') do
-    user_id      = Users::Model::User[:name => 'Spec'].id
-    entry_status = Sections::Model::SectionEntryStatus[:name => 'published'].id
-
-    @section = Sections::Model::Section.create(
-      :name                    => 'Spec section',
-      :comment_allow           => true,
-      :comment_require_account => true,
-      :comment_moderate        => false,
-      :comment_format          => 'plain'
-    )
-
-    @section_entry = Sections::Model::SectionEntry.create(
-      :title                   => 'Spec entry',
-      :user_id                 => user_id,
-      :section_entry_status_id => entry_status,
-      :section_id              => @section.id
-    )
-
-    @section.name.should        === 'Spec section'
-    @section_entry.title.should === 'Spec entry'
-
-    Comments::Model::Comment.all.empty?.should === true
+  # Set up all the required data
+  get_setting(:enable_antispam).value   = false
+  get_setting(:frontend_language).value = 'en'
+
+  user_id      = Users::Model::User[:name => 'Spec'].id
+  entry_status = Sections::Model::SectionEntryStatus[:name => 'published'].id
+
+  section = Sections::Model::Section.create(
+    :name                    => 'Spec section',
+    :comment_allow           => true,
+    :comment_require_account => true,
+    :comment_moderate        => false,
+    :comment_format          => 'plain',
+  )
+
+  section_entry = Sections::Model::SectionEntry.create(
+    :title                   => 'Spec entry',
+    :user_id                 => user_id,
+    :section_entry_status_id => entry_status,
+    :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)
+
+    response.body.should   == lang('zen_general.errors.csrf')
+    response.status.should == 403
   end
 
   it('Submit a comment') do
@@ -43,40 +51,64 @@ describe("Comments::Controller::CommentsForm") do
 
     # Submit the form
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('user_id'      , :with => user_id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
-      fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
       fill_in('comment'      , :with => 'Spec comment')
 
       click_on('Submit')
     end
 
-    # Let's see if the comment exists
     comment = Comments::Model::Comment[:comment => 'Spec comment']
 
-    comment.name.should      === 'Spec user'
-    comment.comment.should   === 'Spec comment'
-    comment.website.should   === 'http://zen-cms.com/'
-    comment.email.should     === 'spec@domain.tld'
-    comment.section_entry_id === @section_entry.id
+    comment.user_name.should  == 'Spec'
+    comment.comment.should    == 'Spec comment'
+    comment.user_email.should == 'spec@domain.tld'
+    comment.section_entry_id  == section_entry.id
   end
 
-  it('Submit a comment without a CSRF token') do
-    url      = Comments::Controller::CommentsForm.r(:save).to_s
-    response = page.driver.post(url)
+  it('Submit a comment with custom events') do
+    event_comment = nil
+
+    Zen::Event.listen(:before_new_comment) do |comment|
+      comment.comment = 'Spec comment event'
+    end
+
+    Zen::Event.listen(:after_new_comment) do |comment|
+      event_comment = comment.comment
+    end
+
+    visit(SpecCommentsForm.r(:index).to_s)
 
-    response.body.should   === lang('zen_general.errors.not_authorized')
-    response.status.should === 403
+    # Submit the form
+    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/')
+      fill_in('email'        , :with => 'spec@domain.tld')
+      fill_in('comment'      , :with => 'Spec comment')
+
+      click_on('Submit')
+    end
+
+    comment = Comments::Model::Comment[:comment => 'Spec comment event']
+
+    comment.name.should      == 'Spec user'
+    comment.comment.should   == 'Spec comment event'
+    comment.website.should   == 'http://zen-cms.com/'
+    comment.email.should     == 'spec@domain.tld'
+    comment.section_entry_id == section_entry.id
+    event_comment.should     == 'Spec comment event'
   end
 
-  it('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
-      fill_in('section_entry', :with => @section_entry.id + 1)
+      fill_in('section_entry', :with => section_entry.id + 1)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -86,21 +118,21 @@ describe("Comments::Controller::CommentsForm") do
     end
 
     page.body.include?(lang('comments.errors.invalid_entry')) \
-      .should === true
+      .should == true
 
-    current_path.should === url
+    current_path.should == url
   end
 
-  it('Submit a comment for an invalid section') do
-    old_id = @section_entry.section_id
+  it('Should fail to submit a comment for an invalid section') do
+    old_id = section_entry.section_id
     url    = SpecCommentsForm.r(:index).to_s
 
-    @section_entry.update(:section_id => nil)
+    section_entry.update(:section_id => nil)
 
     visit(url)
 
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -110,21 +142,21 @@ describe("Comments::Controller::CommentsForm") do
     end
 
     page.body.include?(lang('comments.errors.invalid_entry')) \
-      .should === true
+      .should == true
 
-    current_path.should === url
+    current_path.should == url
 
-    @section_entry.update(:section_id => old_id)
+    section_entry.update(:section_id => old_id)
   end
 
-  it('Submit a comment for a section that does not allow comments') 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)
+    section.update(:comment_allow => false)
     visit(url)
 
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'S)ec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -134,21 +166,21 @@ describe("Comments::Controller::CommentsForm") do
     end
 
     page.body.include?(lang('comments.errors.comments_not_allowed')) \
-      .should === true
+      .should == true
 
-    current_path.should === url
+    current_path.should == url
 
-    @section.update(:comment_allow => true)
+    section.update(:comment_allow => true)
   end
 
-  it('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
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -158,16 +190,16 @@ describe("Comments::Controller::CommentsForm") do
     end
 
     page.body.include?(lang('comments.errors.comments_require_account')) \
-      .should === true
+      .should == true
 
-    current_path.should === url
+    current_path.should == url
 
     # Log back in
     capybara_login
   end
 
   it('Submit a comment with moderation turned on') do
-    @section.update(:comment_moderate => true)
+    section.update(:comment_moderate => true)
 
     url           = SpecCommentsForm.r(:index).to_s
     closed_status = Comments::Model::CommentStatus[:name => 'closed']
@@ -175,7 +207,7 @@ describe("Comments::Controller::CommentsForm") do
     visit(url)
 
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec user')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -184,13 +216,13 @@ describe("Comments::Controller::CommentsForm") do
       click_on('Submit')
     end
 
-    page.body.include?(lang('comments.success.moderate')).should === true
-    current_path.should                                          === url
+    page.body.include?(lang('comments.success.moderate')).should == true
+    current_path.should                                          == url
 
     Comments::Model::Comment[:comment => 'Spec comment'] \
-      .comment_status_id.should === closed_status.id
+      .comment_status_id.should == closed_status.id
 
-    @section.update(:comment_moderate => false)
+    section.update(:comment_moderate => false)
   end
 
   it('Submit a comment and mark it as ham') do
@@ -211,7 +243,7 @@ describe("Comments::Controller::CommentsForm") do
       'http://api.defensio.com/2.0/users/test/documents.yaml'
     ).to_return(:body => yaml_response)
 
-    plugin(:settings, :get, :enable_antispam).value = '1'
+    get_setting(:enable_antispam).value = '1'
 
     url         = SpecCommentsForm.r(:index).to_s
     open_status = Comments::Model::CommentStatus[:name => 'open']
@@ -219,7 +251,7 @@ describe("Comments::Controller::CommentsForm") do
     visit(url)
 
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec alternative')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -228,13 +260,13 @@ describe("Comments::Controller::CommentsForm") do
       click_on('Submit')
     end
 
-    page.body.include?(lang('comments.success.new')).should === true
-    current_path.should                                     === url
+    page.body.include?(lang('comments.success.new')).should == true
+    current_path.should                                     == url
 
     Comments::Model::Comment[:name => 'Spec alternative'] \
-      .comment_status_id.should === open_status.id
+      .comment_status_id.should == open_status.id
 
-    plugin(:settings, :get, :enable_antispam).value = '0'
+    get_setting(:enable_antispam).value = '0'
     WebMock.reset!
   end
 
@@ -256,9 +288,9 @@ describe("Comments::Controller::CommentsForm") do
       'http://api.defensio.com/2.0/users/test/documents.yaml'
     ).to_return(:body => yaml_response)
 
-    plugin(:settings, :get, :enable_antispam).value = '1'
+    get_setting(:enable_antispam).value = '1'
 
-    @section.update(:comment_moderate => true)
+    section.update(:comment_moderate => true)
 
     url           = SpecCommentsForm.r(:index).to_s
     closed_status = Comments::Model::CommentStatus[:name => 'closed']
@@ -266,7 +298,7 @@ describe("Comments::Controller::CommentsForm") do
     visit(url)
 
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec alternative')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -275,16 +307,16 @@ describe("Comments::Controller::CommentsForm") do
       click_on('Submit')
     end
 
-    page.body.include?(lang('comments.success.moderate')).should === true
-    current_path.should                                          === url
+    page.body.include?(lang('comments.success.moderate')).should == true
+    current_path.should                                          == url
 
     Comments::Model::Comment[:name => 'Spec alternative'] \
-      .comment_status_id.should === closed_status.id
+      .comment_status_id.should == closed_status.id
 
-    plugin(:settings, :get, :enable_antispam).value = '0'
+    get_setting(:enable_antispam).value = '0'
     WebMock.reset!
 
-    @section.update(:comment_moderate => false)
+    section.update(:comment_moderate => false)
   end
 
   it('Submit a comment and mark it as spam') do
@@ -305,7 +337,7 @@ describe("Comments::Controller::CommentsForm") do
       'http://api.defensio.com/2.0/users/test/documents.yaml'
     ).to_return(:body => yaml_response)
 
-    plugin(:settings, :get, :enable_antispam).value = '1'
+    get_setting(:enable_antispam).value = '1'
 
     url         = SpecCommentsForm.r(:index).to_s
     spam_status = Comments::Model::CommentStatus[:name => 'spam']
@@ -313,7 +345,7 @@ describe("Comments::Controller::CommentsForm") do
     visit(url)
 
     within('#spec_comments_form') do
-      fill_in('section_entry', :with => @section_entry.id)
+      fill_in('section_entry', :with => section_entry.id)
       fill_in('name'         , :with => 'Spec alternative')
       fill_in('website'      , :with => 'http://zen-cms.com/')
       fill_in('email'        , :with => 'spec@domain.tld')
@@ -322,22 +354,16 @@ describe("Comments::Controller::CommentsForm") do
       click_on('Submit')
     end
 
-    page.body.include?(lang('comments.success.new')).should === true
-    current_path.should                                     === url
+    page.body.include?(lang('comments.success.new')).should == true
+    current_path.should                                     == url
 
     Comments::Model::Comment[:name => 'Spec alternative'] \
-      .comment_status_id.should === spam_status.id
+      .comment_status_id.should == spam_status.id
 
-    plugin(:settings, :get, :enable_antispam).value = '0'
+    get_setting(:enable_antispam).value = '0'
     WebMock.reset!
   end
 
-  it('Delete the test data') do
-    @section_entry.destroy
-    @section.destroy
-
-    Sections::Model::Section[:name => 'Spec section'].should     === nil
-    Sections::Model::SectionEntry[:title => 'Spec entry'].should === nil
-  end
-
+  section_entry.destroy
+  section.destroy
 end