radiant 0.8.2 → 0.9.0.rc2

data/spec/controllers/admin/references_controller_spec.rb

@@ -8,7 +8,7 @@ describe Admin::ReferencesController do
   end
   
   it "should render the associated template on GET to show" do
-    xhr :get, :show, :id => 'tags'
+    xhr :get, :show, :type => 'tags'
     response.should be_success
     response.should render_template('tags')
   end

data/spec/controllers/admin/snippets_controller_spec.rb

@@ -5,7 +5,7 @@ describe Admin::SnippetsController do
 
   before :each do
     ActionController::Routing::Routes.reload
-    login_as :existing
+    login_as :designer
   end
 
   it "should be an ResourceController" do
@@ -79,24 +79,24 @@ describe Admin::SnippetsController do
           response.response_code.should == 401
         end
       else
-        it "should allow access to developers for the #{action} action" do
+        it "should allow access to designers for the #{action} action" do
           lambda {
             send(method, action, :id => snippet_id(:first))
-          }.should restrict_access(:allow => [users(:developer)],
+          }.should restrict_access(:allow => [users(:designer)],
                                   :url => '/admin/pages')
         end
 
         it "should allow access to admins for the #{action} action" do
           lambda {
             send(method, action, :id => snippet_id(:first))
-          }.should restrict_access(:allow => [users(:developer)],
+          }.should restrict_access(:allow => [users(:designer)],
                                    :url => '/admin/pages')
         end
 
-        it "should allow non-developers and non-admins for the #{action} action" do
+        it "should deny non-designers and non-admins for the #{action} action" do
           lambda {
             send(method, action, :id => Snippet.first.id)
-          }.should restrict_access(:allow => [users(:non_admin), users(:existing)],
+          }.should restrict_access(:deny => [users(:non_admin), users(:existing)],
                                    :url => '/admin/pages')
         end
       end

data/spec/controllers/admin/users_controller_spec.rb

@@ -75,7 +75,7 @@ describe Admin::UsersController do
       it "should deny you access to #{action} action if you are not an admin" do
         lambda { 
           send(method, action, :id => user_id(:existing)) 
-        }.should restrict_access(:deny => [users(:developer), users(:existing)],
+        }.should restrict_access(:deny => [users(:designer), users(:existing)],
                                  :url => '/admin/page')
       end
     end
@@ -88,5 +88,14 @@ describe Admin::UsersController do
     response.should redirect_to(admin_users_url)
     flash[:error].should match(/cannot.*self/i)
     User.find(user.id).should_not be_nil
+  end 
+
+  it "should not allow you to remove your own admin privilege" do
+    user = users(:admin)
+    login_as user
+    put :update, { :id => user.id, :user => {:admin => false} }
+    response.should redirect_to(admin_users_url)
+    flash[:error].should match(/cannot remove yourself from the admin role/i)
+    User.find(user.id).admin.should be_true
   end  
 end

data/spec/controllers/admin/welcome_controller_spec.rb

@@ -16,7 +16,7 @@ describe Admin::WelcomeController do
   end
   
   it "should set the current user and redirect when login was successful" do
-    post :login, :user => {:login => "admin", :password => "password"}
+    post :login, :username_or_email => "admin", :password => "password"
     controller.send(:current_user).should == users(:admin)
     response.should be_redirect
     response.should redirect_to(welcome_url)
@@ -37,7 +37,7 @@ describe Admin::WelcomeController do
     end
 
     after do
-      post :login, :user => {:login => "admin", :password => "password"}, :remember_me => 1
+      post :login, :username_or_email => "admin", :password => "password", :remember_me => 1
     end
 
     it "should remember user" do
@@ -74,7 +74,7 @@ describe Admin::WelcomeController do
     describe "and a stored location" do
       before do
         session[:return_to] = '/stored/path'
-        post :login, :user => {:login => "admin", :password => "password"}
+        post :login, :username_or_email => "admin", :password => "password"
       end
 
       it "should redirect" do

data/spec/controllers/application_controller_spec.rb

@@ -39,6 +39,16 @@ describe ApplicationController do
     controller.include_javascript('test').should include('test')
   end
   
+  it "should set the pagination parameters" do
+    ApplicationController.filter_chain.find(:set_pagination_parameters).should_not be_nil
+    param_name = WillPaginate::ViewHelpers.pagination_options[:param_name].to_sym
+    controller.stub!(:params).and_return({param_name => 3, :per_page => 100, :next_link => 'ha'})
+    controller.send :set_pagination_parameters
+    controller.pagination_parameters[:page].should == 3
+    controller.pagination_parameters[:per_page].should == 100
+    controller.pagination_parameters[:next_link].should be_nil
+  end
+  
   describe 'self.template_name' do
     it "should return 'index' when the controller action_name is 'index'" do
       controller.stub!(:action_name).and_return('index')
@@ -66,6 +76,10 @@ describe ApplicationController do
       controller.stub!(:action_name).and_return('show')
       controller.template_name.should == 'show'
     end
+    it "should return the action_name when the action_name is a non-standard name" do
+      controller.stub!(:action_name).and_return('other')
+      controller.template_name.should == 'other'
+    end
   end
 
   describe "set_timezone" do

data/spec/controllers/site_controller_spec.rb

@@ -32,6 +32,18 @@ describe SiteController do
     get :show_page, :url => '/'
     response.should redirect_to(welcome_url)
   end
+  
+  it "should pass pagination parameters to the page" do
+    page = pages(:first)
+    param_name = WillPaginate::ViewHelpers.pagination_options[:param_name] || :p
+    pagination_parameters = {param_name => 3, :per_page => 100}
+    controller.stub!(:pagination_parameters).and_return(pagination_parameters)
+    controller.stub!(:find_page).and_return(page)
+    
+    get :show_page, :url => 'first/'
+    
+    page.pagination_parameters.should == pagination_parameters
+  end
 
   it "should parse pages with Radius" do
     get :show_page, :url => 'radius'
@@ -72,11 +84,37 @@ describe SiteController do
       response.should be_missing
     end
   end
-
+  
   it "should not require login" do
     lambda { get :show_page, :url => '/' }.should_not require_login
   end
 
+  describe "scheduling" do    
+    before do 
+      @sched_page = Page.find(103)
+    end    
+    it "should not display scheduled pages on live site" do
+      @sched_page.published_at = Time.now + 5000
+      @sched_page.save
+      request.host = 'mysite.com'      
+      get :show_page, :url => @sched_page.slug
+      response.response_code.should == 404
+      response.should render_template('site/not_found')
+    end
+    
+    it "should update status of scheduled pages on home page" do
+      @sched_page.published_at = Time.now - 50000
+      @sched_page.status_id = 90
+
+      get :show_page, :url => '/'
+      response.body.should == 'Hello world!'
+      
+      @sched_page2 = Page.find(103)
+      @sched_page2.status_id.should == 100
+    end
+    
+  end
+
   describe "caching" do
     it "should add a default Cache-Control header with public and max-age of 5 minutes" do
       get :show_page, :url => '/'
@@ -116,6 +154,15 @@ describe SiteController do
       response.headers['ETag'].should be_blank
     end
     
+    it "should prevent upstream caching in dev mode" do
+      request.host = "dev.site.com"
+      
+      get :show_page, :url => '/'
+      response.headers['Cache-Control'].should =~ /private/
+      response.headers['Cache-Control'].should =~ /no-cache/
+      response.headers['ETag'].should be_blank
+    end
+    
     it "should set the default cache timeout (max-age) to a value assigned by the user" do
       SiteController.cache_timeout = 10.minutes
       get :show_page, :url => '/'

data/spec/datasets/pages_dataset.rb

@@ -40,6 +40,7 @@ class PagesDataset < Dataset::Base
     create_page "Hidden", :status_id => Status[:hidden].id
     date = Time.utc(2006, 1, 11)
     create_page "Dated", :published_at => date, :created_at => (date - 1.day), :updated_at => (date + 1.day)
+    create_page "Scheduled", :published_at => (Time.now + 1.day), :status_id => Status[:scheduled].id
 
     create_page "Devtags" do
       create_page_part "if_dev", :content => "<r:if_dev>dev</r:if_dev>"
@@ -55,7 +56,10 @@ class PagesDataset < Dataset::Base
       create_page_part "recursive_body", :name => "body", :content => "<r:content />"
       create_page_part "recursive_one", :name => "one", :content => '<r:content part="two" />'
       create_page_part "recursive_two", :name => "two", :content => '<r:content part="one" />'
+      create_page_part "repetitive_part", :name => "repeat",
+        :content => '<r:content part="beat"/><r:content part="beat"/>'
+      create_page_part "repeated_part", :name => "beat", :content => 'x'
     end
   end
   
-end
+end

data/spec/datasets/users_dataset.rb

@@ -4,29 +4,42 @@ class UsersDataset < Dataset::Base
     create_user "Existing"
     create_user "Another"
     create_user "Admin", :admin => true
-    create_user "Developer", :developer => true
-    create_user "Non-admin", :admin => false
+    create_user "Designer", :designer => true
+    create_user "Non_admin", :admin => false
   end
   
   helpers do
     def create_user(name, attributes={})
-      create_model :user, name.symbolize, user_attributes(attributes.update(:name => name))
+      user = create_model :user, name.downcase.to_sym, user_attributes(attributes.update(:name => name))
+      if user.nil?
+        throw "Error creating user dataset for #{name}"
+      end
     end
+    
     def user_attributes(attributes={})
-      name = attributes[:name] || "John Doe"
-      symbol = name.symbolize
+      name = attributes[:name]
+      if name.nil?
+        throw "name attribute is required"
+      end
+      
       attributes = { 
         :name => name,
-        :email => "#{symbol}@example.com", 
-        :login => symbol.to_s,
+        :email => "#{name.downcase}@example.com", 
+        :login => name.downcase,
         :password => "password"
       }.merge(attributes)
       attributes[:password_confirmation] = attributes[:password]
       attributes
     end
-    def user_params(attributes={})
-      password = attributes[:password] || "password"
-      user_attributes(attributes).update(:password => password, :password_confirmation => password)
+    
+    def user_params(options = {})
+      {
+        :name => 'John Doe',
+        :login => 'jdoe',
+        :password => 'password',
+        :password_confirmation => 'password',
+        :email => 'jdoe@gmail.com'
+      }.merge(options)
     end
     
     def login_as(user)

data/spec/generators/extension_controller_generator_spec.rb

@@ -11,7 +11,9 @@ describe "ExtensionControllerGenerator with normal options" do
   
   it 'should generate the controller file in the correct location' do
     'vendor/extensions/example'.should have_generated_controller_for('Events') do |body|
-      body.should have_methods(*%w(show new index))
+      %w(show new index).each do |name|
+        body.should have_method(name)
+      end
     end
   end
   
@@ -28,11 +30,15 @@ describe "ExtensionControllerGenerator with normal options" do
   end
   
   it 'should generate the view files in the correct location' do
-    'vendor/extensions/example'.should have_generated_views_for('Events', %w(show new index))
+    %w(show new index).each do |action|
+      'vendor/extensions/example'.should have_generated_view_for('Events', action)
+    end
   end
   
-  it 'should generate the view spec file in the correct location' do
-    'vendor/extensions/example'.should have_generated_view_specs_for('Events', *%w(show new index))
+  it 'should generate the view spec files in the correct location' do
+    %w(show new index).each do |action|
+      'vendor/extensions/example'.should have_generated_view_spec_for('Events', action)
+    end
   end
   
   after(:each) do
@@ -58,7 +64,9 @@ describe "ExtensionControllerGenerator with test unit" do
   
   it 'should generate the controller file in the correct location' do
     'vendor/extensions/example'.should have_generated_controller_for('Events') do |body|
-      body.should have_methods(*%w(show new index))
+      %w(show new index).each do |name|
+        body.should have_method(name)
+      end
     end
   end
   
@@ -71,7 +79,9 @@ describe "ExtensionControllerGenerator with test unit" do
   end
   
   it 'should generate the view files in the correct location' do
-    'vendor/extensions/example'.should have_generated_views_for('Events', %w(show new index))
+    %w(show new index).each do |action|
+      'vendor/extensions/example'.should have_generated_view_for('Events', action)
+    end
   end
   
   after(:each) do

data/spec/generators/extension_generator_spec.rb

@@ -2,9 +2,11 @@ require File.dirname(__FILE__) + "/extension_generators_spec_helper"
 
 describe "ExtensionGenerator with normal options" do
   it_should_behave_like AllGenerators
-  
+
   before(:each) do
     cp_r File.join(BASE_ROOT, 'lib/generators/extension'),  File.join(RADIANT_ROOT, 'vendor/generators')
+    git_config = {'user.name' => 'Ext Author', 'user.email' => 'ext@radiantcms.org', 'github.user' => 'extauthor'}
+    Git.should_receive(:global_config).and_return git_config
     run_generator('extension', %w(Sample))
   end
   
@@ -12,29 +14,44 @@ describe "ExtensionGenerator with normal options" do
     'vendor/extensions/sample'.should have_generated_file('README')
   end
   
-  it "should generate Rake file" do
+  it "should generate a Rakefile" do
     'vendor/extensions/sample'.should have_generated_file('Rakefile') do |body|
-      body.should match(/Spec::Rake::SpecTask.new(:spec)/)
+      body.should match(/Spec::Rake::SpecTask\.new\(:spec\)/)
+    end
+  end
+  
+  it "should generate a config/routes.rb file" do
+    'vendor/extensions/sample'.should have_generated_file('config/routes.rb') do |body|
+      body.should match(/ActionController::Routing::Routes.draw do \|map\|((\n|\s*.*\n)*)\s+\# end/)
     end
   end
   
   it "should generate extension init file" do
     'vendor/extensions/sample'.should have_generated_class('sample_extension', 'Radiant::Extension') do |body|
-      body.should match(/version "1.0"\n\s+description "Describe your extension here"\n\s+url "http:\/\/yourwebsite.com\/sample_extension"/)
-      body.should match(/define_routes do \|map\|((\n|\s*.*\n)*)\s+\# end/)
-      body.should have_methods('activate', 'deactivate')
+      body.should match(/version "1.0"\n\s+description "Describe your extension here"\n\s+url "http:\/\/github.com\/extauthor\/radiant-sample-extension"/)
+      body.should match(/extension_config do \|config\|((\n|\s*.*\n)*)\s+\# end/)
+      body.should have_method('activate')
     end
   end
   
   it "should generate extension Rake tasks file" do
     'vendor/extensions/sample'.should have_generated_file('lib/tasks/sample_extension_tasks.rake') do |body|
-      body.should match(/namespace :radiant do\n  namespace :extensions do\n    namespace :sample do\n((\n|\s*.*\n)*)    end\n  end\nend/)
-      tasks = $1
+      body.should match(r = /namespace :radiant do\n  namespace :extensions do\n    namespace :sample do\n((\n|\s*.*\n)*)    end\n  end\nend/)
+      tasks = body.match(r)[1]
       tasks.should match(/task :migrate => :environment do\n((\n|\s*.*\n)*)\s+end/)
       tasks.should match(/task :update => :environment do\n((\n|\s*.*\n)*)\s+end/)
     end
   end
-  
+
+  it "should populate Rakefile with gem info" do
+    'vendor/extensions/sample'.should have_generated_file('Rakefile') do |body|
+      body.should match(%r(gem.name = "radiant-sample-extension"))
+      body.should match(%r(gem.email = "ext@radiantcms.org"))
+      body.should match(%r(gem.homepage = "http://github.com/extauthor/radiant-sample-extension"))
+      body.should match(%r(gem.authors = \["Ext Author"\]))
+    end
+  end
+
   it "should generate extension controllers directory" do
     'vendor/extensions/sample'.should have_generated_directory('app/controllers')
   end
@@ -83,6 +100,22 @@ describe "ExtensionGenerator with normal options" do
     'vendor/extensions/sample'.should have_generated_file('cucumber.yml')
   end
   
+  it "should generate extension config directory" do
+    'vendor/extensions/sample'.should have_generated_directory('config')
+  end
+  
+  it "should generate extension routes.rb file" do
+    'vendor/extensions/sample'.should have_generated_file('config/routes.rb')
+  end
+  
+  it "should generate extension locales directory" do
+    'vendor/extensions/sample'.should have_generated_directory('config/locales')
+  end
+  
+  it "should generate extension en.yml file" do
+    'vendor/extensions/sample'.should have_generated_file('config/locales/en.yml')
+  end
+  
   it "should generate extension features support directory" do
     'vendor/extensions/sample'.should have_generated_directory('features/support')
   end
@@ -101,6 +134,7 @@ describe "ExtensionGenerator with test-unit option" do
   it_should_behave_like AllGenerators
   
   before(:each) do
+    Git.stub!(:global_config).and_return({})
     cp_r File.join(BASE_ROOT, 'lib/generators/extension'),  File.join(RADIANT_ROOT, 'vendor/generators')
     run_generator('extension', %w(Sample --with-test-unit))
   end
@@ -111,22 +145,21 @@ describe "ExtensionGenerator with test-unit option" do
   
   it "should generate Rake file" do
     'vendor/extensions/sample'.should have_generated_file('Rakefile') do |body|
-      body.should match(/Rake::TestTask.new(:test)/)
+      body.should match(/Rake::TestTask\.new\(:test\)/)
     end
   end
   
   it "should generate extension init file" do
     'vendor/extensions/sample'.should have_generated_class('sample_extension', 'Radiant::Extension') do |body|
-      body.should match(/version "1.0"\n\s+description "Describe your extension here"\n\s+url "http:\/\/yourwebsite.com\/sample_extension"/)
-      body.should match(/define_routes do \|map\|((\n|\s*.*\n)*)\s+\# end/)
-      body.should have_methods('activate', 'deactivate')
+      body.should match(/version "1.0"\n\s+description "Describe your extension here"\n\s+url "http:\/\/yourwebsite.com\/sample"/)
+      body.should have_method('activate')
     end
   end
   
   it "should generate extension Rake tasks file" do
     'vendor/extensions/sample'.should have_generated_file('lib/tasks/sample_extension_tasks.rake') do |body|
-      body.should match(/namespace :radiant do\n  namespace :extensions do\n    namespace :sample do\n((\n|\s*.*\n)*)    end\n  end\nend/)
-      tasks = $1
+      body.should match(r = /namespace :radiant do\n  namespace :extensions do\n    namespace :sample do\n((\n|\s*.*\n)*)    end\n  end\nend/)
+      tasks = body.match(r)[1]
       tasks.should match(/task :migrate => :environment do\n((\n|\s*.*\n)*)\s+end/)
       tasks.should match(/task :update => :environment do\n((\n|\s*.*\n)*)\s+end/)
     end
@@ -167,7 +200,7 @@ describe "ExtensionGenerator with test-unit option" do
   it "should generate extension test helper file" do
     'vendor/extensions/sample'.should have_generated_file('test/test_helper.rb') do |body|
       body.should match(/require 'test\/unit'/)
-      body.should match(/class Test::Unit::TestCase\n((\n|\s*.*\n)*)end/)
+      body.should match(/class ActiveSupport::TestCase\n((\n|\s*.*\n)*)end/)
     end
   end
   
@@ -180,5 +213,3 @@ describe "ExtensionGenerator with test-unit option" do
     rm_rf Dir["#{RADIANT_ROOT}/vendor/generators/*"]
   end
 end
-
-