hydra-head 3.0.0pre3 → 3.0.0pre4

data/test_support/features/contributor_add.feature

@@ -10,15 +10,19 @@ Feature: Add a Contributor
   @nojs
   Scenario: Add a person without javascript
     Given I am logged in as "archivist1@example.com"
-    And I am on the edit document page for hydrangea:fixture_mods_article1
-    When I follow "Add a Person"
-    And I fill in the following:
-    | Computing ID  | 098556 |
-    | First Name    | Myra |
-    | Last Name     | Breckenridge |
-    | Department    | Posture and Empathy |
-    | Institution   | Academy for Aspiring Young Actors and Actresses |
-    # And I press "Add Person"
+    #When I am on the edit document page for hydrangea:fixture_mods_article1
+    When I am on the edit contributor page for hydrangea:fixture_mods_article1
+    And I press "Add Another Author"
+#    When I fill in the following:
+    Then I fill in "person_2_computing_id" with "098556"
+    And I fill in "person_2_first_name" with "Myra"
+    And I fill in "person_2_last_name" with "Breckenridge"
+    And I fill in "person_2_description" with "Posture and Empathy"
+    And I fill in "person_2_institution" with "Academy for Aspiring Young Actors and Actresses"
+    And I press "Continue"
+    Then I should see "Your changes have been saved."
+    And I should see "Breckenridge"
+#    Then I should see "The First and Last names are required for all authors."
     #    Then I should be on the edit document page for hydrus:test_object1
     #    And the following should contain:
     #    | Computing ID  | 098556 |
@@ -26,13 +30,14 @@ Feature: Add a Contributor
     #    | Last Name     | Breckenridge |
     #    | Department    | Posture and Empathy |
     #    | Institution   | Academy for Aspiring Young Actors and Actresses |
-
-  @nojs
-  Scenario: Add an organization without javascript
-    Given I am logged in as "archivist1@example.com"
-    And I am on the edit document page for hydrangea:fixture_mods_article1
-    When I follow "Add an Organization"
-    And I fill in "Organization" with "American Film Academy"
+  
+  # need to figure out the deal w/ organizations.  Not in spec.
+#  @nojs
+#  Scenario: Add an organization without javascript
+#    Given I am logged in as "archivist1@example.com"
+#    And I am on the edit document page for hydrangea:fixture_mods_article1
+#    When I follow "Add an Organization"
+#    And I fill in "Organization" with "American Film Academy"
     # And I press "Add Organization"
     # Then I should be on the edit document page for hydrus:test_object1
     # And the "Organization" field should contain "American Film Academy"

data/test_support/features/default_partials_edit.feature

@@ -0,0 +1,27 @@
+Feature: Default Partials - Edit View
+  I want to see appropriate information in the edit view for (active) fedora objects that use the default partials
+
+  Scenario: In Edit View for Object Using Default Partials
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit document page for hydra:test_default_partials
+    Then I should see "hydra:test_default_partials"
+    And I should see "descMetadata"
+    And I should see "rightsMetadata"
+
+  Scenario: html5 valid - unauthenticated 
+    When I am on the edit document page for hydra:test_default_partials
+    Then I should see "do not have sufficient privileges"
+    And the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (read)
+    Given I am logged in as "public@nopermissions.com" 
+    When I am on the edit document page for hydra:test_default_partials
+    Then I should see "do not have sufficient privileges"
+    And the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (edit)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit document page for hydra:test_default_partials
+    Then I should see "descMetadata"
+    And the page should be HTML5 valid
+

data/test_support/features/default_partials_search_result.feature

@@ -0,0 +1,22 @@
+Feature: Default Partials in Search Results
+  I want to see appropriate information in search results for (active)fedora objects that use the default partials
+
+  Scenario: Have a Search Result that is an Object That Uses Default Partials
+    Given I am on the home page
+    And I fill in "q" with "default"
+    When I press "submit"
+    Then I should see a link to "the show document page for hydra:test_default_partials"
+
+  Scenario: html5 valid - unauthenticated 
+    Given I am on the home page
+    And I fill in "q" with "default"
+    When I press "submit"
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated 
+    Given I am logged in as "archivist1@example.com" 
+    And I am on the home page
+    And I fill in "q" with "default"
+    When I press "submit"
+    Then I should see a link to "the show document page for hydra:test_default_partials"
+    And the page should be HTML5 valid

data/test_support/features/default_partials_show.feature

@@ -0,0 +1,24 @@
+Feature: Default Partials - Show View
+  I want to see appropriate information in the show view for objects that use the default partials
+
+  Scenario: In Show View for Object Using Default Partials
+    When I am on the show document page for hydra:test_default_partials
+    Then I should see "ID"
+    And I should see "Download"
+    And I should see "hydra:test_default_partials"
+
+  Scenario: html5 valid - unauthenticated 
+    When I am on the show document page for hydra:test_default_partials
+    And the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (read)
+    Given I am logged in as "public@nopermissions.com" 
+    When I am on the show document page for hydra:test_default_partials
+    Then I should see "Download"
+    And the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (edit)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the show document page for hydra:test_default_partials
+    Then I should see "Download"
+    And the page should be HTML5 valid

data/test_support/features/file_upload.feature

@@ -7,34 +7,67 @@ Feature: Upload file into a document
   @nojs
   Scenario: Upload files on dataset edit page
     Given I am logged in as "archivist1@example.com"
-    And I am on the edit document page for hydrangea:fixture_mods_dataset1
-    And I attach the file "test_support/fixtures/image.jp2" to "Filedata"
-    When I press "Upload File"
+    When I am on the edit files page for hydrangea:fixture_mods_dataset1
+    And I select "1" from "number_of_files"
+    And I press "Continue"
+    When I attach the file "test_support/fixtures/image.jp2" to "Filedata[]"
+    And I press "Upload File"
     Then I should see "The file image.jp2 has been saved"
-    And I should see a link to "image.jp2" in the file assets list
+    # we shouldn't have to have the step below once we're displaying the contents of the previous steps.
+    When I follow "Switch to browse view"
+    Then I should see a link to "image.jp2" in the file assets list
     
   Scenario: Upload files on article edit page
     Given I am logged in as "archivist1@example.com"
-    And I am on the edit document page for hydrangea:fixture_mods_article1
-    And I attach the file "test_support/fixtures/image.jp2" to "Filedata"
-    When I press "Upload File"
+    When I am on the edit files page for hydrangea:fixture_mods_article1
+    Then I select "1" from "number_of_files"
+    And I press "Continue"
+    When I attach the file "test_support/fixtures/image.jp2" to "Filedata[]"
+    And I press "Upload File"
     Then I should see "The file image.jp2 has been saved"
-    And I should see a link to "image.jp2" in the file assets list
-  
-  @nojs
-  Scenario: Upload files on file assets list page
+    # we shouldn't have to have the step below once we're displaying the contents of the previous steps.
+    When I follow "Switch to browse view"
+    Then I should see a link to "image.jp2" in the file assets list
+    
+  Scenario: Not uploading files
     Given I am logged in as "archivist1@example.com"
-    And I am on the file asset list page for hydrangea:fixture_mods_dataset1
-#Then show me the page
-    And I attach the file "test_support/fixtures/image.jp2" to "Filedata"
-    When I press "Upload File"
-    Then I should see "The file image.jp2 has been saved"
-    And I should see a link to "image.jp2" in the file assets list
+    When I am on the edit files page for hydrangea:fixture_mods_article1
+    Then I select "0" from "number_of_files"
+    And I press "Continue"
+    Then I should see "Group Permissions"
   
-  Scenario: Upload files on file asset creation page
+  Scenario: html5 valid uploading files on edit page
     Given I am logged in as "archivist1@example.com"
-    And I am on the file asset creation page for hydrangea:fixture_mods_dataset1
-    And I attach the file "test_support/fixtures/image.jp2" to "Filedata"
+    When I am on the edit files page for hydrangea:fixture_mods_article1
+    Then the page should be HTML5 valid
+    And I select "1" from "number_of_files"
+    Then I press "Continue"
+    Then the page should be HTML5 valid
+    And I attach the file "test_support/fixtures/image.jp2" to "Filedata[]"
     When I press "Upload File"
-    Then I should see "The file image.jp2 has been saved"
-    And I should see a link to "image.jp2" in the file assets list
+    Then the page should be HTML5 valid
+  
+  # Not sure if the file asset list is valid.  Will the user ever actually be here?  
+  # @nojs
+  # Scenario: Upload files on file assets list page
+  #   Given I am logged in as "archivist1@example.com"
+  #   And I am on the file asset list page for hydrangea:fixture_mods_dataset1
+  #   And I attach the file "spec/fixtures/image.jp2" to "Filedata[]"
+  #   When I press "Upload File"
+  #   Then I should see "The file image.jp2 has been saved"
+  #   And I should see a link to "image.jp2" in the file assets list
+  # 
+  # Scenario: Upload files on file asset creation page
+  #   Given I am logged in as "archivist1@example.com"
+  #   And I am on the file asset creation page for hydrangea:fixture_mods_dataset1
+  #   And I attach the file "spec/fixtures/image.jp2" to "Filedata[]"
+  #   When I press "Upload File"
+  #   Then I should see "The file image.jp2 has been saved"
+  #   And I should see a link to "image.jp2" in the file assets list
+  # 
+  # Scenario: html5 valid uploading files on file assets list page
+  #   Given I am logged in as "archivist1@example.com"
+  #   And I am on the file asset creation page for hydrangea:fixture_mods_article1
+  #   And I attach the file "spec/fixtures/image.jp2" to "Filedata[]"
+  #   When I press "Upload File"
+  #   Then the page should be HTML5 valid

data/test_support/features/generic_content_create.feature

@@ -0,0 +1,7 @@
+Feature: GenericContent Create View
+  I want to see appropriate information for creating GenericContent objects
+
+  Scenario: html5 valid
+    Given I am logged in as "archivist1@example.com"
+    When I create a new generic_content
+    Then the page should be HTML5 valid

data/test_support/features/generic_content_edit.feature

@@ -0,0 +1,21 @@
+Feature: GenericContent Edit View
+  I want to see appropriate information for editing GenericContent objects
+
+  Scenario: In Edit View for GenericContent object
+    When I am on the edit document page for hydra:test_generic_content
+    Then I should see "A test object using the GenericContent (active)fedora model"
+
+  Scenario: html5 valid - unauthenticated 
+    When I am on the edit document page for hydra:test_generic_content
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (read)
+    Given I am logged in as "public@nopermissions.com" 
+    When I am on the edit document page for hydra:test_generic_content
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (edit)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit document page for hydra:test_generic_content
+    Then the page should be HTML5 valid
+

data/test_support/features/generic_content_search_result.feature

@@ -0,0 +1,22 @@
+Feature: GenericContent Search Results
+  I want to see appropriate information for GenericContent objects in a search result
+
+  Scenario: Have a GenericContent Search Result
+    Given I am on the home page
+    And I fill in "q" with "generic content"
+    When I press "submit"
+    Then I should see a link to "the show document page for hydra:test_generic_content"
+
+  Scenario: html5 valid - unauthenticated 
+    Given I am on the home page
+    And I fill in "q" with "generic content"
+    When I press "submit"
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated 
+    Given I am logged in as "archivist1@example.com" 
+    And I am on the home page
+    And I fill in "q" with "generic content"
+    When I press "submit"
+    Then the page should be HTML5 valid
+

data/test_support/features/generic_content_show.feature

@@ -0,0 +1,20 @@
+Feature: GenericContent Show View
+  I want to see appropriate information for GenericContent objects in the show view
+
+  Scenario: In Show View for GenericContent Object
+    When I am on the show document page for hydra:test_generic_content
+    Then I should see "A test object using the GenericContent (active)fedora model"
+
+  Scenario: html5 valid - unauthenticated 
+    When I am on the show document page for hydra:test_generic_content
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (read)
+    Given I am logged in as "public@nopermissions.com" 
+    When I am on the show document page for hydra:test_generic_content
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (edit)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the show document page for hydra:test_generic_content
+    Then the page should be HTML5 valid

data/test_support/features/generic_image_create.feature

@@ -0,0 +1,7 @@
+Feature: GenericImage Create View
+  I want to see appropriate information for creating GenericImage objects
+
+  Scenario: html5 valid
+    Given I am logged in as "archivist1@example.com"
+    When I create a new generic_image
+    Then the page should be HTML5 valid

data/test_support/features/generic_image_edit.feature

@@ -0,0 +1,21 @@
+Feature: GenericImage Edit View
+  I want to see appropriate information for editing GenericImage objects
+
+  Scenario: In Edit View for GenericImage Object
+    When I am on the edit document page for hydra:test_generic_image
+    Then I should see "A test object using the GenericImage (active)fedora model"
+
+  Scenario: html5 valid - unauthenticated 
+    When I am on the edit document page for hydra:test_generic_image
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (read)
+    Given I am logged in as "public@nopermissions.com" 
+    When I am on the edit document page for hydra:test_generic_image
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (edit)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit document page for hydra:test_generic_image
+    Then the page should be HTML5 valid
+

data/test_support/features/generic_image_search_result.feature

@@ -0,0 +1,22 @@
+Feature: GenericImage Search Results
+  I want to see appropriate information for GenericImage objects in a search result
+
+  Scenario: Have a GenericImage Search Result
+    Given I am on the home page
+    And I fill in "q" with "generic image"
+    When I press "submit"
+    Then I should see a link to "the show document page for hydra:test_generic_image"
+
+  Scenario: html5 valid - unauthenticated 
+    Given I am on the home page
+    And I fill in "q" with "generic image"
+    When I press "submit"
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated 
+    Given I am logged in as "archivist1@example.com" 
+    And I am on the home page
+    And I fill in "q" with "generic image"
+    When I press "submit"
+    Then the page should be HTML5 valid
+

data/test_support/features/generic_image_show.feature

@@ -0,0 +1,20 @@
+Feature: GenericImage Show View
+  I want to see appropriate information for GenericImage objects in the show view
+
+  Scenario: In Show View for GenericImage Object
+    When I am on the show document page for hydra:test_generic_image
+    Then I should see "A test object using the GenericImage (active)fedora model"
+
+  Scenario: html5 valid - unauthenticated 
+    When I am on the show document page for hydra:test_generic_image
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (read)
+    Given I am logged in as "public@nopermissions.com" 
+    When I am on the show document page for hydra:test_generic_image
+    Then the page should be HTML5 valid
+
+  Scenario: html5 valid - authenticated (edit)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the show document page for hydra:test_generic_image
+    Then the page should be HTML5 valid

data/test_support/features/html_validity.feature

@@ -0,0 +1,43 @@
+Feature: HTML validity
+  In order to verify that the application in HTML5 valid
+  As a user
+  I want to the pages to conform to the W3C HTML5 validation
+  
+  Scenario: Home page (unauthenticated)
+    When I am on the home page
+    Then the page should be HTML5 valid
+    
+  Scenario: Home page (authenticated)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the home page
+    Then the page should be HTML5 valid
+    
+  Scenario: Search Results (unauthenticated)
+    Given I am on the home page
+    When I follow "Article"
+    Then I should see "TITLE OF HOST JOURNAL"
+    And the page should be HTML5 valid
+    
+  Scenario: Search Results (authenticated)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the home page
+    And I follow "Article"
+    Then I should see "TITLE OF HOST JOURNAL"
+    And the page should be HTML5 valid
+    
+  Scenario: Record view browse (unauthenticated)
+    Given I am on the show document page for hydrangea:fixture_mods_article2
+    Then I should see "TITLE OF HOST JOURNAL"
+    And the page should be HTML5 valid
+    
+  Scenario: Record view browse (authenticated)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the show document page for hydrangea:fixture_mods_article2
+    Then I should see "TITLE OF HOST JOURNAL"
+    And the page should be HTML5 valid
+    
+  Scenario: Record view edit (authenticated)
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit publication page for hydrangea:fixture_mods_article1
+    Then the "journal_0_title_info_main_title" field should contain "TITLE OF HOST JOURNAL" 
+    And the page should be HTML5 valid

data/test_support/features/mods_asset_contributors_edit.feature

@@ -18,19 +18,11 @@ Feature: Edit Article Contributors
     # And the "Last Name" field for "person_1" should contain "Lacks"
     # And the "Role" field for "person_1" should contain "Contributor"
     # And the "Institution" field for "person_1" should contain "Baltimore"
-    Then I should see "Henrietta"
-    And I should see "Lacks"
+    Then the "First Name" field within "#person_1" should contain "Henrietta"
+    And the "Last Name" field within "#person_1" should contain "Lacks"
     # And I should see "Contributor" within "select[rel=person_1_role_text]" # Author roles are implicit
-    And I should see "Baltimore"
+    And the "Institution" field within "#person_1" should contain "Baltimore"
     And I should see a delete contributor button for "the 2nd person entry in hydrangea:fixture_mods_article1"
-    
-    Then I should see "NSF"
-    And I should see "Funder" within "select[rel=organization_0_role_text]"    
-    And I should see a delete contributor button for "the 1st organization entry in hydrangea:fixture_mods_article1"
-    
-    Then I should see "some conference"
-    And I should see "Host" within "select[rel=conference_0_role_text]"    
-    And I should see a delete contributor button for "the 1st conference entry in hydrangea:fixture_mods_article1"
 
   @local
   Scenario: Viewing contributors in edit mode
@@ -60,13 +52,14 @@ Feature: Edit Article Contributors
     And I should see "Baltimore"
     And I should not see a delete contributor button for "the 2nd person entry in hydrangea:fixture_mods_article1"
 
-    Then I should see "NSF"
-    And I should see "Funder" within "#organization_0"    
-    And I should not see a delete contributor button for "the 1st organization entry in hydrangea:fixture_mods_article1"
+    # The following 6 lines are commented out due to the organization being removed from the contributors forms in the Mods Asset Workflow document
+    #Then the "organization_0_namePart" field should contain "NSF"
+    #And I should see "Funder" within "#organization_0"    
+    #And I should not see a delete contributor button for "the 1st organization entry in hydrangea:fixture_mods_article1"
 
-    Then I should see "some conference"
-    And I should see "Host" within "#conference_0"    
-    And I should not see a delete contributor button for "the 1st conference entry in hydrangea:fixture_mods_article1"
+    #Then I should see "some conference"
+    #And I should see "Host" within "#conference_0"    
+    #And I should not see a delete contributor button for "the 1st conference entry in hydrangea:fixture_mods_article1"
 
   @local
   Scenario: Viewing contributors in browse mode
@@ -76,5 +69,20 @@ Feature: Edit Article Contributors
     And I should see "Author" within ".contributor_role"
     And I should see "University of Virginia" within "#contributors_list"
     And I should not see a delete contributor button for "the 1st person entry in libra-oa:1"
-
- 
+    
+  Scenario: Deleting contributors
+    Given I am logged in as "archivist1@example.com"
+    When I am on the edit contributor page for libra-oa:1
+    And I press "Add Another Author"
+    When I fill in "person_1_computing_id" with "012345"
+    And I fill in "person_1_first_name" with "Jane"
+    And I fill in "person_1_last_name" with "Dough"
+    Then the "person_1_last_name" field within "#person_1" should contain "Dough"
+    And I fill in "person_1_description" with "Pizza Chef"
+    And I fill in "person_1_institution" with "Academy for Aspiring Young Pizza Chefs"
+    When I press "Continue"
+    And I am on the edit contributor page for libra-oa:1
+    Then the "person_1_last_name" field within "#person_1" should contain "Dough"
+    When I follow "Delete"
+    And I press "Continue"
+    Then I should not see "Dough"

data/test_support/features/mods_asset_create.feature

@@ -1,12 +1,17 @@
 @new @dataset 
-Feature: Add a new Dataset
-  In order to publish a Dataset
+Feature: ModsAsset Create View
   As a Depositor
-  I want to submit a new MODS Asset
+  I want to see appropriate information for creating ModsAsset objects
+  In order to submit a new MODS Asset
   
-  Scenario: Visit New MODS Asset Page
+  Scenario: Create Workflow for New ModsAsset Object
     Given I am logged in as "archivist1@example.com"
-    And I am on the home page	
-    And I create a new mods_asset
-    Then I should see "Describe the Asset"
-    And the "title_info_main_title" field should contain ""
+    When I create a new mods_asset
+    Then I should see "Created a Mods Asset"
+    And I should see "Now it's ready to be edited."
+    And the "person_0_first_name" field should contain ""
+    
+  Scenario: html5 valid
+    Given I am logged in as "archivist1@example.com"
+    When I create a new mods_asset
+    Then the page should be HTML5 valid

data/test_support/features/mods_asset_edit.feature

@@ -1,33 +1,65 @@
 @edit @articles
-Feature: Edit a document
-  In order to [goal]
-  [stakeholder]
-  wants [behaviour]
+Feature: Edit a ModsAsset object
+  As a Depositor
+  I want to see appropriate information for editing ModsAsset objects
   
-  Scenario: Visit Document Edit Page
+  Scenario: Edit Page for Mods Asset
     Given I am logged in as "archivist1@example.com" 
     And I am on the edit document page for hydrangea:fixture_mods_article1 
-    Then I should see "ARTICLE TITLE" within "#title_fieldset"    
-    And I should see a "Save Description" button
+    Then the "person_0_first_name" field should contain "GIVEN NAMES"    
+    And I should see a "Continue" button
 
   Scenario: Visit Document Edit Page and see the file assets
      Given I am logged in as "archivist1@example.com" 
-     And I am on the edit document page for libra-oa:1
-     Then I should see "The Smallest Victims of the " within "#title_fieldset"
+     And I am on the edit files page for libra-oa:1
+     And I select "1" from "number_of_files"
+     And I press "Continue"
+#     Then the "title_info_main_title" field should contain "The Smallest Victims of the "
 		 Then I should see "gibson.pdf" within "tr.file_asset"
-		 And I should see a delete button for "libra-oa:1"      
+		 And I should see "Delete" in the file assets list
 
   Scenario: Viewing browse/edit buttons
     Given I am logged in as "archivist1@example.com" 
-    And I am on the edit document page for hydrangea:fixture_mods_article1
-    Then I should see a "span" tag with a "class" attribute of "edit-browse"
+    When I am on the edit document page for hydrangea:fixture_mods_article1
+    Then I should see a "div" tag with a "class" attribute of "edit-browse"
+    
+  Scenario: Entering a non-valid embargo date
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit additional_info page for hydrangea:fixture_mods_article1
+    And I fill in "embargo_embargo_release_date" with "25-25-25"
+    And I press "Continue"
+    Then I should see "You must enter a valid release date."
+    
+  Scenario: Entering different date formats for embargo
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit additional_info page for hydrangea:fixture_mods_article1
+    And I fill in "embargo_embargo_release_date" with "11/1/2010"
+    When I press "Continue"
+    And I am on the edit additional_info page for hydrangea:fixture_mods_article1
+    Then the "embargo_embargo_release_date" field within "#release_date_field" should contain "2010-11-01"
+    When I fill in "embargo_embargo_release_date" with "November 1st 2010"
+    And I press "Continue"
+    When I am on the edit additional_info page for hydrangea:fixture_mods_article1
+    Then the "embargo_embargo_release_date" field within "#release_date_field" should contain "2010-11-01"
+    # The last 2 lines are just clean up.
+    Then I fill in "embargo_embargo_release_date" with ""
+    And I press "Continue"
+
+  Scenario: Save and Finish
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit additional_info page for hydrangea:fixture_mods_article1
+    When I press "Save and Finish"
+    Then I should see "Switch to edit view"
+    And I should see "Your object has been saved"
 
+  Scenario: html5 valid
+    Given I am logged in as "archivist1@example.com"
+    When I am on the edit document page for hydrangea:fixture_mods_article1 
+    Then the page should be HTML5 valid
 
   # the mockups for Libra did not have a delete confirmation
   @overwritten
   Scenario: Delete Confirmation on Edit Page
     Given I am logged in as "archivist1@example.com" 
-    And I am on the edit document page for hydrangea:fixture_mods_article1 
-    Then I should see a "div" tag with an "id" attribute of "delete_dialog_container"
-    And I should see "Permanently delete"
-
+    When I am on the edit document page for hydrangea:fixture_mods_article1 
+    Then I should see a "div" tag with a "class" attribute of "delete-asset"

data/test_support/features/mods_asset_edit_without_permission.feature

@@ -6,5 +6,10 @@ Feature: Edit an article without permission
   
   Scenario: Visit Document Edit Page
     Given I am logged in as "archivist1@example.com" 
-    And I am on the edit document page for hydrangea:fixture_mods_article2
+    When I am on the edit document page for hydrangea:fixture_mods_article2
     Then I should see a "div" tag with a "class" attribute of "notice"
+
+  Scenario: Authenticated but not Authorized to Edit
+    Given I am logged in as "archivist1@example.com" 
+    When I am on the edit document page for hydrangea:fixture_mods_article2
+    Then the page should be HTML5 valid