hydra-head 4.0.0.rc6 → 4.0.0

data/test_support/etc/Gemfile

@@ -9,6 +9,7 @@ gem 'sqlite3'
 
 gem 'blacklight', '~>3.3.0'
 
+gem 'therubyracer' # For compiling js - needed on the ci server
 
 gem 'hydra-head', :path => '../../'
 gem 'devise'

data/test_support/features/absent_model_search_result.feature

@@ -6,13 +6,13 @@ Feature: Objects Without Models - Search Results
   Scenario: html5 valid - unauthenticated 
     When I am on the home page
     And I fill in "q" with "test"
-    And I press "submit"
+    And I press "search"
     Then I should not see a link to "the show document page for hydra:test_no_model"
 
   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 "test"
-    When I press "submit"
+    When I press "search"
     Then the page should be HTML5 valid
 

data/test_support/features/default_partials_search_result.feature

@@ -4,19 +4,19 @@ Feature: Default Partials in Search Results
   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"
+    When I press "search"
     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"
+    When I press "search"
     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"
+    When I press "search"
     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/generic_content_search_result.feature

@@ -4,19 +4,19 @@ Feature: GenericContent Search Results
   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"
+    When I press "search"
     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"
+    When I press "search"
     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"
+    When I press "search"
     Then the page should be HTML5 valid
 

data/test_support/features/generic_image_search_result.feature

@@ -4,19 +4,19 @@ Feature: GenericImage Search Results
   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"
+    When I press "search"
     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"
+    When I press "search"
     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"
+    When I press "search"
     Then the page should be HTML5 valid
 

data/test_support/features/mods_asset_search_result.feature

@@ -6,7 +6,7 @@ Feature: ModsAsset Search Result
   Scenario: Search Results have ModsAsset info
     Given I am on the home page
     And I fill in "q" with "1234-5678"
-    When I press "submit"
+    When I press "search"
     Then I should see a link to "the show document page for hydrangea:fixture_mods_article3"
     And I should see "Test Article"
     And I should see "Aug. 1, 1998"

data/test_support/features/mods_asset_show.feature

@@ -30,7 +30,7 @@ Feature: ModsAsset Show View
   Scenario: Public visit Document Show Page for a private document  
     Given I am on the show document page for hydrangea:fixture_archivist_only_mods_article
     Then I should be on the search page
-    And I should see "You do not have sufficient access privileges to read this document, which has been marked private" within ".notice"
+    And I should see "You do not have sufficient access privileges to read this document, which has been marked private" within ".alert"
   
   @overwritten
   Scenario: Superuser visits Document Show Page for a private document

data/test_support/features/step_definitions/edit_metadata_steps.rb

@@ -47,7 +47,7 @@ Then /^I should see a "([^"]*)" button(?: within "([^"]*)")?$/ do |button_locato
 end
 
 Given /^that "([^"]*)" has been loaded into fedora$/ do |pid|
-  ActiveFedora::FixtureLoader.new('spec/fixtures').reload(pid)
+  ActiveFedora::FixtureLoader.new(File.dirname(__FILE__) + '/../../fixtures').reload(pid)
   
 end
 

data/test_support/features/step_definitions/html_validity_steps.rb

@@ -19,6 +19,9 @@ def response_is_html_valid?(resp)
   rescue SocketError, RestClient::BadGateway #meaning we're either not connected to the internet or we were throttled by the validator.
     puts "WARNING: No connection to W3C validator.  Page may not be HTML5 valid!"
     return true
+  rescue RestClient::RequestTimeout
+    puts "WARNING: Timeout connecting to W3C validator.  Page may not be HTML5 valid!"
+    return true
   end
   
   xml = Nokogiri::XML(validator_response)
@@ -26,6 +29,13 @@ def response_is_html_valid?(resp)
   #removing namespaces because we really don't care
   xml.remove_namespaces!
 
+  fault = xml.xpath("//Fault/Code/Subcode/Value").text
+  if fault.present?
+    puts "WARNING: There was an error with the W3C validator.  Page may not be HTML5 valid!"
+    puts "FAULT: #{fault}"
+    return true
+  end
+
   # "true" or "false"
   valid = xml.xpath("//validity").text
   error_list = xml.xpath("//errors/errorlist/error")
@@ -54,4 +64,4 @@ def response_is_html_valid?(resp)
     puts text unless errors == []
     return false
   end
-end
+end

data/test_support/features/view_catalog_index.feature

@@ -11,7 +11,7 @@ Feature: Catalog Index
   Scenario: Executing a search
     Given I am on the catalog index page
     And I fill in "q" with "hydrangea"
-    And I press "submit"
+    And I press "search"
     Then I should see "Title"
     And I should see "Author"
     And I should see "Work"

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -72,12 +72,14 @@ describe CatalogController do
         assigns(:document_list).count.should == @public_only_results.docs.count
       end
       it "should return all documents if role does have permissions" do
-       	User.any_instance.stubs(:email).returns("BigWig@example.com")
-        mock_user =  User.new
+        mock_user =  FactoryGirl.create(:user, :email=>"BigWig@example.com")
         # session[:superuser_mode] = true
         mock_user.stubs(:is_being_superuser?).returns(true)
+        #sign_in mock_user
         controller.stubs(:current_user).returns(mock_user)
         get :index
+        ### This fails when there are more than 10 public documents in the solr index
+        ### TODO: instead, expect a certain query(especially the :fq component) to solr
         assigns(:document_list).count.should > @public_only_results.docs.count
       end
     end

data/test_support/spec/controllers/catalog_controller_viewing_context_spec.rb

@@ -41,10 +41,8 @@ describe CatalogController do
   
   describe "edit" do
     it "should enforce edit permissions, redirecting to show action and resetting session context if user does not have edit permissions" do
-      mock_user = mock("User")
-      mock_user.stubs(:email).returns("patron1@example.com")
-      mock_user.stubs(:is_being_superuser?).returns(false)
-      controller.stubs(:current_user).returns(mock_user)
+      mock_user = FactoryGirl.build(:user, :email => "patron1@example.com")
+      sign_in mock_user
       
       get :edit, :id=>"hydrangea:fixture_mods_article1"
       response.should redirect_to(:action => 'show')

data/test_support/spec/controllers/catalog_valid_html_spec.rb

@@ -42,13 +42,11 @@ describe CatalogController do
     end
     
     it "Should have Valid HTML when I'm logged in" do
-        
-        mock_user = mock("User")
-        mock_user.stubs(:email).returns("archivist1@example.com")
+        mock_user = FactoryGirl.build(:user, :email=>"archivist1@example.com")
         mock_user.stubs(:can_be_superuser?).returns(true)
         mock_user.stubs(:is_being_superuser?).returns(true)
 
-        controller.stubs(:current_user).returns(mock_user)
+        sign_in mock_user
         get("index", "controller"=>"catalog")
         document_check(response.body)
     end
@@ -57,11 +55,10 @@ describe CatalogController do
   describe "Document Pages" do 
     
     before(:each)  do
-        mock_user = mock("User")
-        mock_user.stubs(:email).returns("archivist1@example.com")
+        mock_user = FactoryGirl.build(:user, :email=>"archivist1@example.com")
         mock_user.stubs(:can_be_superuser?).returns(true)
         mock_user.stubs(:is_being_superuser?).returns(true)
-        controller.stubs(:current_user).returns(mock_user)
+        sign_in mock_user
     end
     
     #Article Data Type

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -59,6 +59,7 @@ describe Hydra::FileAssetsController do
       mock_user = mock("User")
       mock_user.stubs(:email).returns("fake_user@example.com")
       mock_user.stubs(:is_being_superuser?).returns(false)
+      mock_user.stubs(:new_record?).returns(false)
       controller.stubs(:current_user).returns(mock_user)
       get(:show, :id=>"hydrangea:fixture_file_asset1")
       response.should redirect_to(:action => 'index')

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -89,65 +89,6 @@ describe Hydra::AccessControlsEnforcement do
       @solr_parameters[:fq].should include("-has_model_s:\"info:fedora/afmodel:FileAsset\"")  
     end
   end
-  
- describe "build_lucene_query" do
-
-   it "should return fields for all roles the user is a member of checking against the discover, access, read fields" do
-     stub_user = User.new :email=>'archivist1@example.com'
-     stub_user.stubs(:is_being_superuser?).returns false
-     helper.stubs(:current_user).returns(stub_user)
-     # This example assumes that archivist1 is in the archivist and researcher groups.
-     # Tried stubbing RoleMapper.roles instead, but that broke 26 other tests because mocha fails to release the expectation.
-     # RoleMapper.stubs(:roles).with(stub_user.email).returns(["archivist", "researcher"])
-     query = helper.send(:build_lucene_query, "query_string")
-     # RoleMapper.stubs(:roles).with(stub_user.email).returns(["archivist", "researcher"])
-     # query = helper.send(:build_lucene_query, "string")
-     
-     ["discover","edit","read"].each do |type|
-       query.should match(/_query_\:\"#{type}_access_group_t\:archivist/) and
-       query.should match(/_query_\:\"#{type}_access_group_t\:researcher/)
-     end
-     query.should match /^_query_:"\{!dismax qf=\$qf_dismax pf=\$pf_dismax\}query_string" AND NOT _query_:"info\\\\:fedora\/afmodel\\\\:FileAsset"/
-   end
-   it "should not have dismax clause if no user_query is suplied" do
-     stub_user = User.new
-     stub_user.stubs(:is_being_superuser?).returns false
-     helper.stubs(:current_user).returns(stub_user)
-     query = helper.send(:build_lucene_query, nil)
-     query.should match /^NOT _query_:"info\\\\:fedora\/afmodel\\\\:FileAsset"/
-   end
-
-   it "should return fields for all the person specific discover, access, read fields" do
-     stub_user = User.new
-     stub_user.stubs(:is_being_superuser?).returns false
-     helper.stubs(:current_user).returns(stub_user)
-     query = helper.send(:build_lucene_query, "string")
-     ["discover","edit","read"].each do |type|
-       query.should match(/_query_\:\"#{type}_access_person_t\:#{stub_user.email}/)
-     end
-   end
-   describe "for superusers" do
-     it "should return superuser access level" do
-       stub_user = User.new
-       stub_user.stubs(:is_being_superuser?).returns true
-       helper.stubs(:current_user).returns(stub_user)
-       query = helper.send(:build_lucene_query, "string")
-       ["discover","edit","read"].each do |type|         
-         query.should match(/_query_\:\"#{type}_access_person_t\:\[\* TO \*\]/)
-       end
-     end
-     it "should not return superuser access to non-superusers" do
-       stub_user = User.new
-       stub_user.stubs(:is_being_superuser?).returns false
-       helper.stubs(:current_user).returns(stub_user)
-       query = helper.send(:build_lucene_query, "string")
-       ["discover","edit","read"].each do |type|
-         query.should_not match(/_query_\:\"#{type}_access_person_t\:\[\* TO \*\]/)
-       end
-     end
-   end
-
- end
 end
 
 

data/test_support/spec/helpers/access_controls_evaluation_spec.rb

@@ -4,8 +4,7 @@ describe Hydra::AccessControlsEvaluation do
   
   describe "editor?" do
     it "should return true if current_user.is_being_superuser? is true" do
-      mock_user = mock("User")
-      mock_user.stubs(:email).returns "BigWig@example.com"
+      mock_user = FactoryGirl.build(:user, :email => "BigWig@example.com")
       mock_user.stubs(:is_being_superuser?).returns true
       controller.stubs(:current_user).returns mock_user
       helper.editor?.should be_true
@@ -18,6 +17,7 @@ describe Hydra::AccessControlsEvaluation do
       mock_user = mock("User")
       mock_user.stubs(:email).returns "nobody_special@example.com"
       mock_user.stubs(:is_being_superuser?).returns(false)
+      mock_user.stubs(:new_record?).returns(false)
       controller.stubs(:current_user).returns(mock_user)
       helper.editor?.should be_false
     end

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -5,12 +5,6 @@ describe BlacklightHelper do
     BlacklightHelper.included_modules.should include(HydraHelper)
   end
   
-  describe "Application Name Sanity Check" do
-    it "should have the application correct name" do 
-      helper.application_name.should == "A Hydra Head"
-    end 
-  end
-  
   describe "Overridden blacklight methods" do
     describe "document_partial_name" do
 
@@ -28,20 +22,10 @@ describe BlacklightHelper do
         item = stub("item", :value=>'two', :hits=>9)
 
         ret_val = helper.render_selected_facet_value("one", item)
-        ret_val.should == "<span class=\"selected label\">two <span class=\"count\">(9)</span></span>"
+        ret_val.should == "<span class=\"selected\">two <span class=\"count\">(9)</span></span>"
         ret_val.should be_html_safe
       end
     end
-    describe "render_head_content" do
-      before (:each) do
-        helper.expects(:content_for).with(:head).returns("My added content")
-        head_stuff = ["Something extra", "Stuff for unapi-server"]
-        helper.expects(:extra_head_content).twice().returns(head_stuff)
-      end
-      it "adds the content of content_for(:head) to the output" do
-        helper.render_head_content.should == "Something extraMy added content"
-      end
-    end
     
     describe "link back to catalog" do
       it "should return the view parameter in the link back to catalog method if there is one in the users previous search session" do

data/test_support/spec/models/ability_spec.rb

@@ -1,10 +1,40 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Ability do
-
   it "should call custom_permissions" do
-      Ability.any_instance.expects(:custom_permissions)
-      ability = Ability.new(nil)
-      ability.can?(:delete, 7)
+    Ability.any_instance.expects(:custom_permissions)
+    subject = Ability.new(nil) 
+    subject.can?(:delete, 7)
+  end
+
+  context "for a not-signed in user" do
+    subject { Ability.new(nil) }
+    it "should be able to read objects that are public" do
+      public_object = ModsAsset.new
+      public_object.rightsMetadata.update_permissions("group"=>{'public'=>'read'}) 
+      public_object.save
+      subject.can?(:read, public_object).should be_true
+    end
+    it "should not be able to read objects that are registered" do
+      registered_object = ModsAsset.new
+      registered_object.rightsMetadata.update_permissions("group"=>{'registered'=>'read'}) 
+      registered_object.save
+      subject.can?(:read, registered_object).should_not be_true
+    end
+  end
+  context "for a signed in user" do
+    subject { Ability.new(FactoryGirl.create(:user)) }
+    it "should be able to read objects that are public" do
+      public_object = ModsAsset.new
+      public_object.rightsMetadata.update_permissions("group"=>{'public'=>'read'}) 
+      public_object.save
+      subject.can?(:read, public_object).should be_true
+    end
+    it "should be able to read objects that are registered" do
+      registered_object = ModsAsset.new
+      registered_object.rightsMetadata.update_permissions("group"=>{'registered'=>'read'}) 
+      registered_object.save
+      subject.can?(:read, registered_object).should be_true
+    end
   end
 end