radiant 0.6.2 → 0.6.3

data/public/javascripts/sitemap.js

@@ -131,7 +131,7 @@ Object.extend(SiteMap.prototype, {
     var id = this.extractPageId(row).toString();
     new Ajax.Updater(
       row,
-      '/admin/ui/pages/children/' + id + '/' + level,
+      '../admin/ui/pages/children/' + id + '/' + level,
       {
         asynchronous: true,
         insertion: Insertion.After,

data/public/stylesheets/admin/main.css

@@ -4,7 +4,10 @@ body {
   margin: 0;
   padding: 0;
 }
-img { border: 0; }
+img, input[type='image'] { 
+	border: 0;
+	vertical-align: middle; 
+}
 h3 {
   font-size: 130%;
   margin-top: 1.25em;
@@ -607,4 +610,4 @@ table#filter-reference-table blockquote {
   margin: 0;
   margin-top: 1em;
   margin-bottom: 1em;
-}
+}

data/test/fixtures/extensions/01_basic/vendor/plugins/multiple/init.rb

@@ -0,0 +1 @@
+require 'multiple'

data/test/fixtures/extensions/01_basic/vendor/plugins/multiple/lib/multiple.rb

@@ -0,0 +1,2 @@
+module Multiple
+end

data/test/fixtures/extensions/01_basic/vendor/plugins/plugin_normal/init.rb

@@ -0,0 +1 @@
+require 'normal_plugin'

data/test/fixtures/extensions/01_basic/vendor/plugins/plugin_normal/lib/normal_plugin.rb

@@ -0,0 +1,2 @@
+module NormalPlugin
+end

data/test/fixtures/extensions/02_overriding/overriding_extension.rb

@@ -2,7 +2,7 @@ class OverridingExtension < Radiant::Extension
   version "1.2"
   description "overrides a view from basic extension"
   url "http://test.com"
-
+  
   def activate
   end
 

data/test/fixtures/extensions/02_overriding/vendor/plugins/multiple/init.rb

@@ -0,0 +1 @@
+require 'multiple'

data/test/fixtures/extensions/02_overriding/vendor/plugins/multiple/lib/multiple.rb

@@ -0,0 +1,2 @@
+module Multiple
+end

data/test/fixtures/extensions/load_order_blue/load_order_blue_extension.rb

@@ -0,0 +1,11 @@
+class LoadOrderBlueExtension < Radiant::Extension
+  version "1.2"
+  description "for load order tests"
+  url "http://test.com"
+  
+  def activate
+  end
+
+  def deactivate
+  end
+end

data/test/fixtures/extensions/load_order_green/load_order_green_extension.rb

@@ -0,0 +1,11 @@
+class LoadOrderGreenExtension < Radiant::Extension
+  version "1.2"
+  description "for load order tests"
+  url "http://test.com"
+  
+  def activate
+  end
+
+  def deactivate
+  end
+end

data/test/fixtures/extensions/load_order_red/load_order_red_extension.rb

@@ -0,0 +1,11 @@
+class LoadOrderRedExtension < Radiant::Extension
+  version "1.2"
+  description "for load order tests"
+  url "http://test.com"
+  
+  def activate
+  end
+
+  def deactivate
+  end
+end

data/test/fixtures/pages.yml

@@ -358,4 +358,19 @@ gallery_draft:
   slug: gallery_draft
   status_id: 1
   parent_id: 50
-  published_at: 2006-02-05 08:44:07 
+  published_at: 2006-02-05 08:44:07 
+custom_404_root:
+  id: 58
+  title: Custom 404 Root
+  slug: custom_404
+  status_id: 100
+  parent_id: 1
+  published_at: 2006-02-05 08:44:07 
+custom_404:
+  id: 59
+  title: Custom File Not Found
+  slug: missing
+  class_name: CustomFileNotFoundPage
+  status_id: 100
+  parent_id: 58
+  published_at: 2006-02-05 08:44:07 

data/test/functional/admin/abstract_model_controller_test.rb

@@ -17,13 +17,13 @@ class Admin::AbstractModelControllerTest < Test::Unit::TestCase
   end
   
   fixtures :users, :layouts
-  test_helper :layouts, :caching, :routing
+  test_helper :layouts, :caching, :routing, :login
   
   def setup
     @controller = TestModelController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @request.session['user'] = users(:existing)
+    login_as(:existing)
     @cache = @controller.cache = FakeResponseCache.new
     
     @layout_name = "Test Layout"

data/test/functional/admin/export_controller_test.rb

@@ -6,12 +6,13 @@ class Admin::ExportController; def rescue_action(e) raise e end; end
 
 class Admin::ExportControllerTest < Test::Unit::TestCase
   fixtures :users, :pages
+  test_helper :login
   
   def setup
     @controller = Admin::ExportController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @request.session['user'] = users(:developer)
+    login_as(:developer)
   end
 
   def test_yaml

data/test/functional/admin/extension_controller_test.rb

@@ -7,12 +7,13 @@ class Admin::ExtensionController; def rescue_action(e) raise e end; end
 class Admin::ExtensionControllerTest < Test::Unit::TestCase
   
   fixtures :users
+  test_helper :login
   
   def setup
     @controller = Admin::ExtensionController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @request.session['user'] = users(:admin)
+    login_as(:admin)
   end
 
   def test_index

data/test/functional/admin/layout_controller_test.rb

@@ -6,13 +6,13 @@ class Admin::LayoutController; def rescue_action(e) raise e end; end
 
 class Admin::LayoutControllerTest < Test::Unit::TestCase
   fixtures :users, :layouts
-  test_helper :users, :layouts
+  test_helper :users, :layouts, :login
   
   def setup
     @controller = Admin::LayoutController.new
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
-    @request.session['user'] = users(:developer)
+    login_as(:developer)
   end
 
   def test_ancestors
@@ -21,7 +21,8 @@ class Admin::LayoutControllerTest < Test::Unit::TestCase
   
   [:index, :new, :edit, :remove].each do |action|
     define_method "test_#{action}_action_allowed_if_admin" do
-      get action, { :id => 1 }, { 'user' => users(:admin) }
+      login_as(:admin)
+      get action, { :id => 1 }
       assert_response :success, "action: #{action}"
     end
     
@@ -31,7 +32,8 @@ class Admin::LayoutControllerTest < Test::Unit::TestCase
     end
     
     define_method "test_#{action}_action__not_allowed_if_other" do
-      get action, { :id => 1 }, { 'user' => users(:existing) }, {}
+      login_as(:existing)
+      get action, { :id => 1 }
       assert_redirected_to page_index_url, "action: #{action}"
       assert_match /privileges/, flash[:error], "action: #{action}"
     end

data/test/functional/admin/page_controller_test.rb

@@ -6,13 +6,13 @@ class Admin::PageController; def rescue_action(e) raise e end; end
 
 class Admin::PageControllerTest < Test::Unit::TestCase
   fixtures :users, :pages
-  test_helper :pages, :page_parts, :caching
+  test_helper :pages, :page_parts, :caching, :login
   
   def setup
     @controller = Admin::PageController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    @request.session['user'] = users(:existing)
+    login_as(:existing)
     
     @page_title = 'Just a Test'
     
@@ -160,10 +160,28 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     assert_equal 'Ruby Home Page', @page.title
   end  
   def test_edit__post
+    @cache = @controller.cache = FakeResponseCache.new
     @page = create_test_page
     post :edit, :id => @page.id, :page => page_params(:status_id => '1')
     assert_response :redirect
     assert_equal 1, get_test_page.status.id
+
+    @page = get_test_page
+    assert_kind_of Page, @page
+    assert_equal '/page/', @cache.expired_path
+    
+    # To-Do: Test what happens when an invalid page is submitted 
+  end
+  def test_edit__post_with_slug_change
+    @cache = @controller.cache = FakeResponseCache.new
+    @page = create_test_page
+    post :edit, :id => @page.id, :page => page_params(:slug => 'monkey', :status_id => '1')
+    assert_response :redirect
+    assert_equal 1, get_test_page.status.id
+
+    @page = get_test_page
+    assert_kind_of Page, @page
+    assert_equal '/page/', @cache.expired_path
     
     # To-Do: Test what happens when an invalid page is submitted 
   end
@@ -180,26 +198,26 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     @page = get_test_page 
     assert_equal 1, @page.parts.size
     assert_equal 'changed', @page.parts.first.content
-  end
-
-  def test_edit__post_with_optimistic_locking
-    @page = create_test_page
-    post :edit, :id => @page.id, :page => page_params(:status_id => '1', :lock_version => '12')
-    assert_response :success # not redirected
-    assert_match /has been modified/, flash[:error]
-  end
-  
-  def test_edit__post_with_parts_and_optimistic_locking
-    @page = create_test_page
-    @page.parts.create(part_params(:name => 'test-part-1', :content => 'original-1'))
-    post :edit, :id => @page.id, :page => page_params(:status_id => '1', :lock_version => '12'), :part => {'1' => part_params(:name => 'test-part-1', :content => 'changed-1')}
-    assert_response :success # not redirected
-    assert_match /has been modified/, flash[:error]
-    #changed value must not be saved
-    assert_equal 'original-1', @page.parts.find_by_name('test-part-1').content
-    #but must be rendered to page
-    assert_tag :tag => 'textarea', :content => 'changed-1' 
-  end  
+  end
+
+  def test_edit__post_with_optimistic_locking
+    @page = create_test_page
+    post :edit, :id => @page.id, :page => page_params(:status_id => '1', :lock_version => '12')
+    assert_response :success # not redirected
+    assert_match /has been modified/, flash[:error]
+  end
+  
+  def test_edit__post_with_parts_and_optimistic_locking
+    @page = create_test_page
+    @page.parts.create(part_params(:name => 'test-part-1', :content => 'original-1'))
+    post :edit, :id => @page.id, :page => page_params(:status_id => '1', :lock_version => '12'), :part => {'1' => part_params(:name => 'test-part-1', :content => 'changed-1')}
+    assert_response :success # not redirected
+    assert_match /has been modified/, flash[:error]
+    #changed value must not be saved
+    assert_equal 'original-1', @page.parts.find_by_name('test-part-1').content
+    #but must be rendered to page
+    assert_tag :tag => 'textarea', :content => 'changed-1' 
+  end  
   
   def test_remove
     @page = create_test_page
@@ -208,6 +226,14 @@ class Admin::PageControllerTest < Test::Unit::TestCase
     assert_equal @page, assigns(:page)
     assert_not_nil get_test_page
   end
+  def test_remove_should_show_all_children_regardless_of_sitemap_expansion
+    @page = pages(:homepage)
+    get :remove, :id => @page.id
+    assert_response :success
+    Page.find(:all).each do |page|
+      assert_tag "tr", :attributes => {:id => "page-#{page.id}"}
+    end
+  end
   def test_remove__post
     @page = create_test_page
     post :remove, :id => @page.id

data/test/functional/admin/user_controller_test.rb

@@ -7,13 +7,14 @@ class Admin::UserController; def rescue_action(e) raise e end; end
 class Admin::UserControllerTest < Test::Unit::TestCase
   
   fixtures :users
-  test_helper :user, :logging
+  test_helper :user, :logging, :login
 
   def setup
     @controller = Admin::UserController.new
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
-    @user = @request.session['user'] = create_test_user
+    @user = create_test_user
+    login_as(@user)
   end
   
   def teardown
@@ -26,12 +27,14 @@ class Admin::UserControllerTest < Test::Unit::TestCase
   
   [:index, :new, :edit, :remove].each do |action|
     define_method "test_#{action}_action_allowed_if_admin" do
-      get action, { :id => 1 }, { 'user' => users(:admin) }
+      login_as(:admin)
+      get action, { :id => 1 }
       assert_response :success, "action: #{action}"
     end
 
     define_method "test_#{action}_action_not_allowed_if_other" do
-      get action, { :id => 1 }, { 'user' => users(:non_admin) }
+      login_as(:non_admin)
+      get action, { :id => 1 }
       assert_redirected_to page_index_url, "action: #{action}"
       assert_match /privileges/, flash[:error], "action: #{action}"
     end
@@ -39,7 +42,8 @@ class Admin::UserControllerTest < Test::Unit::TestCase
   
   def test_remove__cannot_remove_self
     @user = users(:admin)
-    get :remove, { :id => @user.id }, { 'user' => @user }
+    login_as(@user)
+    get :remove, { :id => @user.id }
     assert_redirected_to user_index_url
     assert_match /cannot.*self/i, flash[:error]
     assert_not_nil User.find(@user.id)
@@ -56,8 +60,7 @@ class Admin::UserControllerTest < Test::Unit::TestCase
   def test_preferences__post
     post(
       :preferences,
-      { :user => { :password => '', :password_confirmation => '', :email => 'updated@gmail.com' } },
-      { 'user' => @user }
+      { :user => { :password => '', :password_confirmation => '', :email => 'updated@gmail.com' } }
     )
     @user = User.find(@user.id)
     assert_redirected_to page_index_url
@@ -72,10 +75,10 @@ class Admin::UserControllerTest < Test::Unit::TestCase
   
   def test_change_password
     @user = User.create!(:name => 'Test', :login => 'pref_test', :password => 'whoa!', :password_confirmation => 'whoa!')
+    login_as(@user)
     post(
       :preferences,
-      { :user => { :password => 'funtimes', :password_confirmation => 'funtimes' } },
-      { 'user' => @user }
+      { :user => { :password => 'funtimes', :password_confirmation => 'funtimes' } }
     )
     @user = User.find(@user.id)
     assert_equal User.sha1('funtimes'), @user.password

data/test/functional/admin/welcome_controller_test.rb

@@ -6,7 +6,7 @@ class Admin::WelcomeController; def rescue_action(e) raise e end; end
 
 class Admin::WelcomeControllerTest < Test::Unit::TestCase
   
-  test_helper :logging
+  test_helper :logging, :login
   fixtures :users
   
   def setup
@@ -28,7 +28,7 @@ class Admin::WelcomeControllerTest < Test::Unit::TestCase
     post :login, 'user' => { :login => 'existing', :password => 'password' }
     assert_redirected_to welcome_url
     
-    user = session['user']
+    user = @controller.send :current_user
     assert_kind_of User, user
     assert_equal 'existing', user.login
     
@@ -38,13 +38,13 @@ class Admin::WelcomeControllerTest < Test::Unit::TestCase
     post :login, 'user' => { :login => 'invalid', :password => 'password' }
     assert_response :success
     assert_match /invalid/i, flash[:error]
-    assert_nil session['user']
+    assert_nil assigns[:current_user]
   end
   
   def test_logout
     get :logout, nil, { 'user' => users(:existing) }
     assert_redirected_to login_url
-    assert_nil session['user']
+    assert_nil assigns[:current_user]
     assert_match /logged out/i, flash[:notice]
   end
   

data/test/functional/application_controller_test.rb

@@ -7,7 +7,7 @@ class ApplicationController; def rescue_action(e) raise e end; end
 class ApplicationControllerTest < Test::Unit::TestCase
   fixtures :users
   
-  test_helper :routing
+  test_helper :routing, :login
   
   class TestController < ApplicationController
     def test
@@ -37,7 +37,8 @@ class ApplicationControllerTest < Test::Unit::TestCase
   
   def test_before_filter
     UserActionObserver.current_user = nil
-    get :test, {}, { 'user' => @user }
+    login_as(@user)
+    get :test
     assert_response :success
     assert_equal @user, UserActionObserver.current_user
   end

data/test/functional/extension_initialization_test.rb

@@ -32,16 +32,22 @@ class ExtensionInitializationTest < Test::Unit::TestCase
     end
     assert_view_paths :index => /should get changed/
     
+    #only want to clear the test extensions
+    old_list = Dependencies.explicitly_unloadable_constants
+    Dependencies.explicitly_unloadable_constants = Radiant::Extension.descendants.select {|ex| ex.root.index(TEST_ROOT) == 0}.map {|x| x.name }
     Dependencies.clear
+    Dependencies.explicitly_unloadable_constants = old_list
+
     assert_basic_extension_annotations
     assert_view_paths
     assert_admin_tabs "Basic Extension Tab"
+
   end
   
   def test_reactivate
     assert_admin_tabs "Basic Extension Tab"
     Radiant::ExtensionLoader.reactivate []
-    assert_admin_tabs
+    assert Radiant::AdminUI.tabs.all? {|tab| tab.name != "Basic Extension Tab" }
   ensure
     Radiant::ExtensionLoader.reactivate Radiant::Extension.descendants
     assert BasicExtension.active?
@@ -60,13 +66,33 @@ class ExtensionInitializationTest < Test::Unit::TestCase
     assert_basic_extension_annotations
   end
 
+  def test_should_load_plugin_from_vendor_plugin
+    assert_nothing_raised { Radiant::Extension.const_get(:PLUGIN_PLUGIN_NORMAL) }
+    assert_equal BasicExtension.root + "/vendor/plugins/plugin_normal", Radiant::Extension::PLUGIN_PLUGIN_NORMAL
+    assert $LOAD_PATH.include?(BasicExtension.root + "/vendor/plugins/plugin_normal/lib")
+    assert defined?(NormalPlugin)
+  end
+    
+  def test_should_load_multiple_location_plugin_from_first_extension_in_load_order
+    assert_nothing_raised { Radiant::Extension.const_get(:PLUGIN_MULTIPLE) }
+    assert_equal BasicExtension.root + "/vendor/plugins/multiple", Radiant::Extension::PLUGIN_MULTIPLE
+    assert $LOAD_PATH.include?(BasicExtension.root + "/vendor/plugins/multiple/lib")
+    assert defined?(Multiple)
+    assert_not_equal OverridingExtension.root + "/vendor/plugins/multiple", Radiant::Extension::PLUGIN_MULTIPLE
+    assert !$LOAD_PATH.include?(OverridingExtension.root + "/vendor/plugins/multiple/lib")
+  end
+
   private
   
     def assert_admin_tabs(more_tabs = [])
-      default_tabs = %w(Pages Snippets Layouts)
-      all_tabs = default_tabs + [more_tabs].flatten
-      assert_equal all_tabs.size, Radiant::AdminUI.tabs.size
-      Radiant::AdminUI.tabs.each { |tab| assert all_tabs.include?(tab.name) }
+      tabnames = []
+      Radiant::AdminUI.tabs.each do |tab|
+        assert "Duplicate Tab", !tabnames.include?(tab.name)
+        tabnames << tab.name
+      end
+      more_tabs.each do |tabname|
+        assert Radiant::AdminUI.tabs.any? {|tab| tab.name == tabname }
+      end
     end
     
     def assert_basic_extension_annotations