zen 0.3 → 0.4

data/spec/zen/helper/message.rb

@@ -1,22 +1,22 @@
 require File.expand_path('../../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'helper', 'message')
 
-describe('Ramaze::Helper::Message') do
+describe 'Ramaze::Helper::Message' do
   behaves_like :capybara
 
-  it('Display a success message') do
+  it 'Display a success message' do
     visit('/admin/spec-message-helper/success')
 
     page.body.include?('success message').should == true
   end
 
-  it('Display an info message') do
+  it 'Display an info message' do
     visit('/admin/spec-message-helper/info')
 
     page.body.include?('info message').should == true
   end
 
-  it('Display an error message') do
+  it 'Display an error message' do
     visit('/admin/spec-message-helper/error')
 
     page.body.include?('error message').should == true

data/spec/zen/helper/stacked_aspect.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../../../helper', __FILE__)
+require File.join(Zen::FIXTURES, 'helper', 'stacked_aspect')
+
+describe 'Ramaze::Helper::StackedAspect' do
+  behaves_like :capybara
+
+  before do
+    SpecStackedAspect::NUMBERS.each do |k, v|
+      SpecStackedAspect::NUMBERS[k] = 0
+    end
+  end
+
+  it 'Ramaze::Helper::StackedAspect.stacked_before_all' do
+    visit('/spec-stacked-aspect/before_all')
+
+    page.has_content?('15').should                 == true
+    SpecStackedAspect::NUMBERS[:before_all].should == 15
+  end
+
+  it 'Ramaze::Helper::StackedAspect.stacked_before' do
+    visit('/spec-stacked-aspect/before')
+
+    page.has_content?('4').should              == true
+    SpecStackedAspect::NUMBERS[:before].should == 4
+  end
+
+  it 'Ramaze::Helper::StackedAspect.stacked_after_all' do
+    visit('/spec-stacked-aspect/before_all')
+
+    page.has_content?('15').should                == true
+    SpecStackedAspect::NUMBERS[:after_all].should == 15
+  end
+
+  it 'Ramaze::Helper::StackedAspect.stacked_after' do
+    visit('/spec-stacked-aspect/after')
+
+    page.has_content?('0').should             == true
+    SpecStackedAspect::NUMBERS[:after].should == 4
+  end
+end

data/spec/zen/helper/theme.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'theme', 'theme')
 
-describe('Ramaze::Helper::Theme') do
+describe 'Ramaze::Helper::Theme' do
   behaves_like :capybara
 
   before do
@@ -12,13 +12,13 @@ describe('Ramaze::Helper::Theme') do
     get_setting(:theme).value = nil
   end
 
-  it('Render a partial template') do
+  it 'Render a partial template' do
     visit('/helper/partial')
 
     page.body.include?('This is a partial.').should == true
   end
 
-  it('Show a 404 page in a template') do
+  it 'Show a 404 page in a template' do
     visit('/helper/404')
 
     page.body.include?('The requested page could not be found!') \
@@ -27,9 +27,9 @@ describe('Ramaze::Helper::Theme') do
     page.status_code.should == 404
   end
 
-  it('Error when no partials directory has been set') do
-    dir = Zen::Theme['spec_theme'].partial_dir
-    Zen::Theme['spec_theme'].partial_dir = nil
+  it 'Error when no partials directory has been set' do
+    dir = Zen::Theme['spec_theme'].partials
+    Zen::Theme['spec_theme'].partials = nil
 
     begin
       visit('/helper/partial')
@@ -37,12 +37,12 @@ describe('Ramaze::Helper::Theme') do
       e.message.should == 'The theme spec_theme has no partial directory set.'
     end
 
-    Zen::Theme['spec_theme'].partial_dir = dir
+    Zen::Theme['spec_theme'].partials = dir
   end
 
-  it('Error when loading a non existing partial') do
+  it 'Error when loading a non existing partial' do
     theme = File.join(
-      Zen::Theme['spec_theme'].partial_dir,
+      Zen::Theme['spec_theme'].partials,
       'wrong_partial.xhtml'
     )
 

data/spec/zen/language.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../helper', __FILE__)
 require File.expand_path('../../fixtures/zen/language', __FILE__)
 
-describe('Zen::Language') do
+describe 'Zen::Language' do
   behaves_like :capybara
 
   # Ensure the user object is put back in the correct state after each
@@ -13,7 +13,7 @@ describe('Zen::Language') do
     )
   end
 
-  it('Change the current language') do
+  it 'Change the current language' do
     # Check if the frontend language is set properly.
     visit('/spec-language/frontend_dutch')
 
@@ -36,7 +36,7 @@ describe('Zen::Language') do
     page.body.include?('<p>en</p>').should == false
   end
 
-  it('Load an English language pack') do
+  it 'Load an English language pack' do
     Zen::Language.load('spec')
 
     lang('spec.name').should == 'Name'
@@ -45,31 +45,31 @@ describe('Zen::Language') do
     lang('spec.parent.sub').should == 'Sub item'
   end
 
-  it('Load an already loaded language file') do
+  it 'Load an already loaded language file' do
     Zen::Language.load('spec')
 
     lang('spec.name').should == 'Name'
   end
 
-  it('Fail to load a non existing language file') do
+  it 'Fail to load a non existing language file' do
     should.raise?(Zen::LanguageError) do
       Zen::Language.load('does-not-exist')
     end
   end
 
-  it('Fail to access a non existing language string') do
+  it 'Fail to access a non existing language string' do
     should.raise?(Zen::LanguageError) do
       lang('spec.does-not-exist')
     end
   end
 
-  it('Fail to access a non existing language file') do
+  it 'Fail to access a non existing language file' do
     should.raise?(Zen::LanguageError) do
       lang('foo.does-not-exist', 'foo')
     end
   end
 
-  it('Load a Dutch language pack') do
+  it 'Load a Dutch language pack' do
     get_setting(:language).value = 'nl'
 
     lang('spec.name').should       == 'Naam'

data/spec/zen/markup.rb

@@ -1,33 +1,33 @@
 require File.expand_path('../../helper', __FILE__)
 
-describe('Zen::Markup') do
+describe 'Zen::Markup' do
   WebMock.allow_net_connect!
 
-  it('Convert Markdown to HTML') do
+  it 'Convert Markdown to HTML' do
     html = Zen::Markup.convert(:markdown, 'hello **world**').strip
 
     html.should == '<p>hello <strong>world</strong></p>'
   end
 
-  it('Convert Textile to HTML') do
+  it 'Convert Textile to HTML' do
     html = Zen::Markup.convert(:textile, 'hello *world*').strip
 
     html.should == '<p>hello <strong>world</strong></p>'
   end
 
-  it('Convert HTML to plain text') do
+  it 'Convert HTML to plain text' do
     text = Zen::Markup.convert(:plain, '<p>hello world</p>').strip
 
     text.should == '&lt;p&gt;hello world&lt;&#x2F;p&gt;'
   end
 
-  it('Convert to HTML to HTML') do
+  it 'Convert to HTML to HTML' do
     html = Zen::Markup.convert(:html, '<p>hello world</p>')
 
     html.should == '<p>hello world</p>'
   end
 
-  it('Specify a non existing engine') do
+  it 'Specify a non existing engine' do
     begin
       Zen::Markup.convert(:foobar, 'hello')
     rescue ArgumentError => e

data/spec/zen/package.rb

@@ -1,10 +1,10 @@
 require File.expand_path('../../helper', __FILE__)
 require File.join(Zen::FIXTURES, 'package')
 
-describe('Zen::Package') do
+describe 'Zen::Package' do
   behaves_like :capybara
 
-  it('Add a new package') do
+  it 'Add a new package' do
     Zen::Package.add do |p|
       p.name       = :spec
       p.title      = 'Spec'
@@ -13,6 +13,7 @@ describe('Zen::Package') do
       p.url        = 'http://zen-cms.com/'
       p.root       = __DIR__
       p.migrations = __DIR__
+      p.env.foo    = 'bar'
 
       p.menu('Spec', '/admin/spec', :permission => :show_menu) do |sub|
         sub.menu('Sub spec', '/admin/spec/sub')
@@ -28,19 +29,20 @@ describe('Zen::Package') do
     pkg.author.should     == 'Yorick Peterse'
     pkg.root.should       == __DIR__
     pkg.migrations.should == pkg.root
+    pkg.env.foo.should    == 'bar'
 
-    pkg.menu.title.should == 'Spec'
-    pkg.menu.url.should   == '/admin/spec'
+    pkg.menu[0].title.should == 'Spec'
+    pkg.menu[0].url.should   == '/admin/spec'
 
-    pkg.menu.children[0].title.should == 'Sub spec'
-    pkg.menu.children[0].url.should   == '/admin/spec/sub'
+    pkg.menu[0].children[0].title.should == 'Sub spec'
+    pkg.menu[0].children[0].url.should   == '/admin/spec/sub'
 
     pkg.permissions[:foobar].should   == 'Foobar'
   end
 
-  it('Build a package\'s navigation items') do
+  it 'Build a package\'s navigation items' do
     pkg  = Zen::Package[:spec]
-    menu = pkg.menu.html
+    menu = pkg.menu[0].html
     html = '<li><a href="/admin/spec" title="Spec">Spec</a>' \
       '<ul><li><a href="/admin/spec/sub" title="Sub spec">Sub spec</a></li>' \
       '</ul></li>'
@@ -48,7 +50,7 @@ describe('Zen::Package') do
     menu.should == html
   end
 
-  it('Build the navigation menu for all packages') do
+  it 'Build the navigation menu for all packages' do
     menu = Zen::Package.build_menu
     html = '<li><a href="/admin/spec" title="Spec">Spec</a>' \
       '<ul><li><a href="/admin/spec/sub" title="Sub spec">Sub spec</a></li>' \

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

@@ -1,6 +1,6 @@
 require File.expand_path('../../../../../helper', __FILE__)
 
-describe("Categories::Controller::Categories") do
+describe "Categories::Controller::Categories" do
   behaves_like :capybara
 
   after do
@@ -16,20 +16,12 @@ describe("Categories::Controller::Categories") do
 
   group         = Categories::Model::CategoryGroup.create(:name => 'Spec group')
   index_url     = Categories::Controller::Categories.r(:index, group.id).to_s
-  edit_url      = Categories::Controller::Categories.r(:edit , group.id).to_s
+  edit_url      = Categories::Controller::Categories.r(:edit, group.id).to_s
+  new_url       = Categories::Controller::Categories.r(:new, group.id).to_s
   save_button   = lang('categories.buttons.save')
   delete_button = lang('categories.buttons.delete')
 
-  it('Submit a form without a CSRF token') do
-    response = page.driver.post(
-      Categories::Controller::Categories.r(:save).to_s
-    )
-
-    response.body.include?(lang('zen_general.errors.csrf')).should == true
-    response.status.should                                         == 403
-  end
-
-  it('Find no existing categories') do
+  it 'Find no existing categories' do
     message = lang('categories.messages.no_categories')
 
     visit(index_url)
@@ -39,7 +31,18 @@ describe("Categories::Controller::Categories") do
     current_path.should                         == index_url
   end
 
-  it("Create a new category") do
+  it 'Try to create a new category with a missing CSRF token' do
+    visit(new_url)
+
+    within '#category_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 category" do
     new_button  = lang('categories.buttons.new')
     event_name  = nil
     event_name2 = nil
@@ -55,7 +58,7 @@ describe("Categories::Controller::Categories") do
     visit(index_url)
     click_link(new_button)
 
-    within('#category_form') do
+    within '#category_form' do
       fill_in('name', :with => 'Spec category')
       click_on(save_button)
     end
@@ -65,12 +68,12 @@ describe("Categories::Controller::Categories") do
     event_name2.should  == event_name
   end
 
-  it('Search for a category') do
+  it 'Search for a category' do
     visit(index_url)
     search_button = lang('zen_general.buttons.search')
     error         = lang('zen_general.errors.invalid_search')
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'Spec')
       click_on(search_button)
     end
@@ -78,7 +81,7 @@ describe("Categories::Controller::Categories") do
     page.has_content?(error).should           == false
     page.has_content?('Spec category').should == true
 
-    within('#search_form') do
+    within '#search_form' do
       fill_in('query', :with => 'does not exist')
       click_on(search_button)
     end
@@ -88,7 +91,7 @@ describe("Categories::Controller::Categories") do
     page.has_selector?('table tbody tr').should == false
   end
 
-  it("Edit an existing category") do
+  it "Edit an existing category" do
     event_name  = nil
     event_name2 = nil
     name        = 'Spec category modified 123'
@@ -106,7 +109,7 @@ describe("Categories::Controller::Categories") do
 
     current_path.should =~ /#{edit_url}\/[0-9]+/
 
-    within('#category_form') do
+    within '#category_form' do
       fill_in('name', :with => name)
       click_on(save_button)
     end
@@ -121,20 +124,20 @@ describe("Categories::Controller::Categories") do
       category.name = 'Spec category modified'
     end
 
-    within('#category_form') do
+    within '#category_form' do
       click_on(save_button)
     end
 
     page.find('input[name="name"]').value.should == 'Spec category modified'
   end
 
-  it("Edit an existing category with invalid data") do
+  it "Edit an existing category with invalid data" do
     visit(index_url)
     click_link('Spec category')
 
     current_path.should =~ /#{edit_url}\/[0-9]+/
 
-    within('#category_form') do
+    within '#category_form' do
       fill_in('name', :with => '')
       click_on(save_button)
     end
@@ -142,14 +145,43 @@ describe("Categories::Controller::Categories") do
     page.has_selector?('span.error').should == true
   end
 
-  it('Fail to delete a category without an ID') do
+  enable_javascript
+
+  it 'Automatically save a category' do
+    visit(index_url)
+    click_link('Spec category')
+
+    within '#category_form' do
+      fill_in('name', :with => 'Spec category autosave')
+    end
+
+    autosave_form('category_form')
+
+    visit(index_url)
+
+    page.has_content?('Spec category autosave').should == true
+
+    click_link('Spec category autosave')
+
+    within '#category_form' do
+      fill_in('name', :with => 'Spec category modified')
+      click_on(save_button)
+    end
+
+    page.has_selector?('span.error').should      == false
+    page.find('input[name="name"]').value.should == 'Spec category modified'
+  end
+
+  disable_javascript
+
+  it 'Fail to delete a category without an ID' do
     visit(index_url)
     click_on(delete_button)
 
     page.has_selector?('input[name="category_ids[]"]').should == true
   end
 
-  it("Delete an existing category") do
+  it "Delete an existing category" do
     message     = lang('categories.messages.no_categories')
     event_name  = nil
     event_name2 = nil