Changeset 546

Timestamp:

10/08/07 22:27:43 (11 months ago)

Author:

danshep

Message:

shards: fix tests and make tests robust to the introduction of other extensions

Files:

• trunk/extensions/shards/shards_extension.rb (modified) (2 diffs)
• trunk/extensions/shards/test/functional/shards_extension_test.rb (modified) (1 diff)

trunk/extensions/shards/shards_extension.rb

@@ -10 +10 @@
-  def activate
-    ApplicationController.send :helper, Shards::HelperExtensions
+    #helpers aren't automatically inherited by already loaded classes
+    ApplicationController.descendants.each do |controller|
+      controller.send :helper, Shards::HelperExtensions
+    end
-    Radiant::AdminUI.class_eval do
-      attr_accessor :page #, :snippet, :layout
-    end
-
-
-
-
-
-
-
-
-
-
-
-
+
-    Admin::PageController.class_eval {
-      before_filter :only => :add_part do |c|
@@ -36 +29 @@
-  end
-  
+  private
+    def load_default_page_regions
+        page = OpenStruct.new
+        page.edit = Shards::RegionSet.new do |edit|
+            edit.main.concat %w{edit_header edit_form edit_popups}
+            edit.form.concat %w{edit_title edit_extended_metadata
+                                  edit_page_parts}
+            edit.form_bottom.concat %w{edit_buttons}
+            edit.parts_bottom.concat %w{edit_layout_and_type edit_timestamp}
+        end
+        page.index = Shards::RegionSet.new
+        page.remove = Shards::RegionSet.new
+        page.children = Shards::RegionSet.new   
+        page
+    end
+  
-end

trunk/extensions/shards/test/functional/shards_extension_test.rb

@@ -12 +12 @@
-    assert_not_nil admin.page
-    assert_instance_of OpenStruct, admin.page
+  end
+  
+  def test_page_edit_region_set_default_settings
+    page = ShardsExtension.new.send(:load_default_page_regions)
-    %w{edit remove children index}.each do |action|
-admin.
-admin.
+
+
-    end
-admin.
+
-    assert_equal %w{edit_title edit_extended_metadata
- edit_layout_and_type 
-                          edit_timestamp}, admin.page.edit.for
-admin.
+}, page.edit.form
+assert_equal %w{ edit_layout_and_type edit_timestamp}, page.edit.parts_botto
+
-  end
-