admin_ui_spec.rb in radiant-1.0.0.rc1

- old
+ new

@@ -25,11 +25,11 @@
   it "should load the default navigation tabs and sub-items" do
     @admin.load_default_nav
     @admin.nav.should have(3).items
     @admin.nav[:content].should have(1).items
     @admin.nav[:design].should have(2).items
-    @admin.nav[:settings].should have(3).items
+    @admin.nav[:settings].should have(4).items
   end
 
   it "should have collections of Region Sets for every controller" do
     %w{page snippet layout user}.each do |collection|
       @admin.should respond_to(collection)
@@ -45,18 +45,19 @@
       page.send(action).should_not be_nil
       page.send(action).should be_kind_of(Radiant::AdminUI::RegionSet)
     end
     page.edit.main.should == %w{edit_header edit_form edit_popups}
     page.edit.form.should == %w{edit_title edit_extended_metadata
-                                edit_page_parts edit_layout_and_type}
+                                edit_page_parts}
+    page.edit.layout.should == %w{edit_layout edit_type edit_status
+                                  edit_published_at}
     page.edit.parts_bottom.should == %w{}
     page.edit.form_bottom.should == %w{edit_buttons edit_timestamp}
     page.index.sitemap_head.should == %w{title_column_header
                                         status_column_header
-                                        modify_column_header}
-    page.index.node.should == %w{title_column status_column add_child_column
-                                  remove_column}
+                                        actions_column_header}
+    page.index.node.should == %w{title_column status_column actions_column}
     page.remove.should === page.index
     page.children.should === page.index
     page._part.should === page.edit
     page.new.should === page.edit
   end
@@ -67,12 +68,12 @@
     snippet.edit.main.should == %w{edit_header edit_form}
     snippet.edit.form.should == %w{edit_title edit_content edit_filter}
     snippet.edit.form_bottom.should == %w{edit_buttons edit_timestamp}
     snippet.index.should_not be_nil
     snippet.index.top.should == %w{}
-    snippet.index.thead.should == %w{title_header modify_header}
-    snippet.index.tbody.should == %w{title_cell modify_cell}
+    snippet.index.thead.should == %w{title_header actions_header}
+    snippet.index.tbody.should == %w{title_cell actions_cell}
     snippet.index.bottom.should == %w{new_button}
 
     snippet.new.should == snippet.edit
   end
 
@@ -83,12 +84,12 @@
     layout.edit.form.should == %w{edit_title edit_extended_metadata
                                   edit_content}
     layout.edit.form_bottom.should == %w{reference_links edit_buttons edit_timestamp}
     layout.index.should_not be_nil
     layout.index.top.should == %w{}
-    layout.index.thead.should == %w{title_header modify_header}
-    layout.index.tbody.should == %w{title_cell modify_cell}
+    layout.index.thead.should == %w{title_header actions_header}
+    layout.index.tbody.should == %w{title_cell actions_cell}
     layout.index.bottom.should == %w{new_button}
     
     layout.new.should == layout.edit
   end
 
@@ -98,11 +99,11 @@
     user.edit.main.should == %w{edit_header edit_form}
     user.edit.form.should == %w{edit_name edit_email edit_username
                                 edit_password edit_roles edit_locale edit_notes}
     user.edit.form_bottom.should == %w{edit_buttons edit_timestamp}
     user.index.should_not be_nil
-    user.index.thead.should == %w{title_header roles_header modify_header}
-    user.index.tbody.should == %w{title_cell roles_cell modify_cell}
+    user.index.thead.should == %w{title_header roles_header actions_header}
+    user.index.tbody.should == %w{title_cell roles_cell actions_cell}
     user.index.bottom.should == %w{new_button}
     user.preferences.main.should == %w{edit_header edit_form}
     user.preferences.form.should == %w{edit_name edit_email edit_username edit_password edit_locale}
     user.preferences.form_bottom.should == %w{edit_buttons}
     