hydra-core 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5385ee7e7993b67f048caef766fcd449762cfdf
-  data.tar.gz: 0b9c6cfee9dad5b5a30466b09afb5b2dd2fe83c1
+  metadata.gz: 7425271dd98b15843f39e0a9aa0368f38e7e2f24
+  data.tar.gz: e20caccecf6869f8efc0a2b73e2732bf3385bece
 SHA512:
-  metadata.gz: f2e0cdada8d435a00f67f33d49140b2dae55a01b627cdf6b2225d5fa882a7652bbc7da6156a64c48e7b0f60a0ed797897aa060975b823abae9e090a37077e3d8
-  data.tar.gz: 2713e19fd104d74b4871c20c1dc2efa72700339d39f2bc314b6e88aad3cf6fde26b74fdef7c230bc66a162b93ed0445da59ceee6c51610b91f97746eed983f3f
+  metadata.gz: ca92f74f6a0ef2e8ed0d2d74db185124b5641e9c17a79ed9c45d2a010149d77d27ec5da27dc44e9dad5019e67e0829a692f867faea5177f8e712354fa6f8fe66
+  data.tar.gz: 73e7990c27ae8eb7d2b00077c9ff4d6d2ccec8f99f3ecdf4621791c4a43190f2733ba1e74083091c222c07a98d0bea84f5a7314b75487a1a6a52d459f6368bd2

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "7.2.1"
+  VERSION = "7.2.2"
 end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -1,93 +1,66 @@
 require 'spec_helper'
 
-# See cucumber tests (ie. /features/edit_document.feature) for more tests, including ones that test the edit method & view
-# You can run the cucumber tests with 
-#
-# cucumber --tags @edit
-# or
-# rake cucumber
-
 describe CatalogController do
-  
+
   before do
     session[:user]='bob'
   end
-  
+
   it "should use CatalogController" do
-    controller.should be_an_instance_of(CatalogController)
+    expect(controller).to be_an_instance_of CatalogController
   end
-  
-  
+
   describe "Paths Generated by Custom Routes:" do
     # paths generated by custom routes
     it "should map {:controller=>'catalog', :action=>'index'} to GET /catalog" do
-      { :get => "/catalog" }.should route_to(:controller => 'catalog', :action => 'index')
+      expect(get: "/catalog").to route_to(controller: 'catalog', action: 'index')
     end
     it "should map {:controller=>'catalog', :action=>'show', :id=>'test:3'} to GET /catalog/test:3" do
-      { :get => "/catalog/test:3" }.should route_to(:controller => 'catalog', :action => 'show', :id=>'test:3')
+      expect(get: "/catalog/test:3").to route_to(controller: 'catalog', action: 'show', id: 'test:3')
     end
 
     it "should map catalog_path" do
-      # catalog_path.should == '/catalog'
-      catalog_path("test:3").should == '/catalog/test:3'
+      expect(catalog_path("test:3")).to eq '/catalog/test:3'
     end
   end
-  
-  it "should not choke on objects with periods in ids (ie Fedora system objects)" do    
-     skip "Need to override blacklight routes"	
-
-	## We could do something like this to remove the catalog/show route and replace it with a route that allows dots (e.g. resources :catalog, :id=> /.+/)
-	  # def add_route
-	  #   new_route = ActionController::Routing::Routes.builder.build(name, route_options)
-	  #   ActionController::Routing::Routes.routes.insert(0, new_route)
-	  # end
 
-	  # def remove_route
-	  #   ActionController::Routing::Routes.routes.reject! { |r| r.instance_variable_get(:@requirements)[:slug_id] == id }
-	  # end
-
-    catalog_path("fedora-system:FedoraObject-3.0").should == '/catalog/fedora-system:FedoraObject-3.0'
-    { :get => "/catalog/fedora-system:FedoraObject-3.0" }.should route_to(:controller => 'catalog', :action => 'show', :id=>'fedora-system:FedoraObject-3.0')
-  end
-  
   describe "index" do
-    
     describe "access controls" do
       before(:all) do
         fq = "read_access_group_ssim:public OR edit_access_group_ssim:public OR discover_access_group_ssim:public"
-        solr_opts = {:fq=>fq}
-        response = ActiveFedora::SolrService.instance.conn.get('select', :params=> solr_opts)
+        solr_opts = { fq: fq }
+        response = ActiveFedora::SolrService.instance.conn.get('select', params: solr_opts)
         @public_only_results = Blacklight::SolrResponse.new(response, solr_opts)
       end
 
       it "should only return public documents if role does not have permissions" do
-        controller.stub(:current_user).and_return(nil)
+        allow(controller).to receive(:current_user).and_return(nil)
         get :index
-        assigns(:document_list).count.should == @public_only_results.docs.count
+        expect(assigns(:document_list).count).to eq @public_only_results.docs.count
       end
 
       it "should return documents if the group names need to be escaped" do
-        RoleMapper.stub(:roles).and_return(["abc/123","cde/567"])
+        allow(RoleMapper).to receive(:roles).and_return(["abc/123","cde/567"])
         get :index
-        assigns(:document_list).count.should == @public_only_results.docs.count
+        expect(assigns(:document_list).count).to eq @public_only_results.docs.count
       end
     end
   end
-  
+
   describe "filters" do
     describe "index" do
       it "should trigger enforce_index_permissions" do
-        controller.should_receive(:add_access_controls_to_solr_params)
+        expect(controller).to receive(:add_access_controls_to_solr_params)
         get :index
       end
     end
     describe "show" do
       it "should trigger enforce_show_permissions" do
-        controller.stub(:current_user).and_return(nil)
-        controller.should_receive(:enforce_show_permissions)
-        get :show, :id=>'test:3'
+        allow(controller).to receive(:current_user).and_return(nil)
+        expect(controller).to receive(:enforce_show_permissions)
+        get :show, id: 'test:3'
       end
     end
   end
-  
+
 end

data/spec/controllers/downloads_controller_spec.rb

@@ -60,112 +60,112 @@ describe DownloadsController do
     context "when logged in as reader" do
       before do
         sign_in @user
-        User.any_instance.stub(:groups).and_return([])
+        allow_any_instance_of(User).to receive(:groups).and_return([])
       end
       describe "#show" do
         it "should default to returning default download configured by object" do
-          ContentHolder.stub(:default_content_ds).and_return('buzz')
+          allow(ContentHolder).to receive(:default_content_ds).and_return('buzz')
           get "show", :id => @obj.pid
-          response.should be_success
-          response.headers['Content-Type'].should == "image/png"
-          response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
-          response.body.should == 'fizz'
+          expect(response).to be_success
+          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
+          expect(response.body).to eq 'fizz'
         end
         it "should default to returning default download configured by controller" do
-          DownloadsController.default_content_dsid.should == "content"
+          expect(DownloadsController.default_content_dsid).to eq "content"
           get "show", :id => @obj.pid
-          response.should be_success
-          response.headers['Content-Type'].should == "image/png"
-          response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
-          response.body.should == 'foobarfoobarfoobar'
+          expect(response).to be_success
+          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
+          expect(response.body).to eq 'foobarfoobarfoobar'
         end
 
         context "when a specific datastream is requested" do
           context "and it doesn't exist" do
             it "should return :not_found when the datastream doesn't exist" do
               get "show", :id => @obj.pid, :datastream_id => "thumbnail"
-              response.should be_not_found
+              expect(response).to be_not_found
             end
           end
           context "and it exists" do
             it "should return it" do
               get "show", :id => @obj.pid, :datastream_id => "descMetadata"
-              response.should be_success
-              response.headers['Content-Type'].should == "text/plain"
-              response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
-              response.body.should == "It's a stream"
+              expect(response).to be_success
+              expect(response.headers['Content-Type']).to eq "text/plain"
+              expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
+              expect(response.body).to eq "It's a stream"
             end
           end
         end
         it "should support setting disposition to inline" do
           get "show", :id => @obj.pid, :disposition => "inline"
-          response.should be_success
-          response.headers['Content-Type'].should == "image/png"
-          response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
-          response.body.should == 'foobarfoobarfoobar'
+          expect(response).to be_success
+          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"world.png\""
+          expect(response.body).to eq 'foobarfoobarfoobar'
         end
         it "should allow you to specify filename for download" do
           get "show", :id => @obj.pid, "filename" => "my%20dog.png"
-          response.should be_success
-          response.headers['Content-Type'].should == "image/png"
-          response.headers["Content-Disposition"].should == "inline; filename=\"my%20dog.png\""
-          response.body.should == 'foobarfoobarfoobar'
+          expect(response).to be_success
+          expect(response.headers['Content-Type']).to eq "image/png"
+          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"my%20dog.png\""
+          expect(response.body).to eq 'foobarfoobarfoobar'
         end
       end
       describe "stream" do
         before do
-          stub_response = double()
-          stub_response.stub(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
-          stub_repo = double()
-          stub_repo.stub(:datastream_dissemination).and_yield(stub_response)
+          stub_response = double
+          allow(stub_response).to receive(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
+          stub_repo = double
+          allow(stub_repo).to receive(:datastream_dissemination).and_yield(stub_response)
           stub_ds = ActiveFedora::Datastream.new
-          stub_ds.stub(:repository).and_return(stub_repo)
-          stub_ds.stub(:mimeType).and_return('video/webm')
-          stub_ds.stub(:dsSize).and_return(16)
-          stub_ds.stub(:dsid).and_return('webm')
-          stub_ds.stub(:new?).and_return(false)
-          stub_ds.stub(:pid).and_return('changeme:test')
+          allow(stub_ds).to receive(:repository).and_return(stub_repo)
+          allow(stub_ds).to receive(:mimeType).and_return('video/webm')
+          allow(stub_ds).to receive(:dsSize).and_return(16)
+          allow(stub_ds).to receive(:dsid).and_return('webm')
+          allow(stub_ds).to receive(:new?).and_return(false)
+          allow(stub_ds).to receive(:pid).and_return('changeme:test')
           stub_file = double('stub object', datastreams: {'webm' => stub_ds}, pid:'changeme:test', label: "MyVideo.webm")
-          ActiveFedora::Base.should_receive(:load_instance_from_solr).with('changeme:test').and_return(stub_file)
-          controller.stub(:authorize!).with(:download, stub_ds).and_return(true)
-          controller.stub(:log_download)
+          expect(ActiveFedora::Base).to receive(:load_instance_from_solr).with('changeme:test').and_return(stub_file)
+          allow(controller).to receive(:authorize!).with(:download, stub_ds).and_return(true)
+          allow(controller).to receive(:log_download)
         end
         it "head request" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
           head :show, id: 'changeme:test', datastream_id: 'webm'
-          response.headers['Content-Length'].should == 16
-          response.headers['Accept-Ranges'].should == 'bytes'
-          response.headers['Content-Type'].should == 'video/webm'
+          expect(response.headers['Content-Length']).to eq 16
+          expect(response.headers['Accept-Ranges']).to eq 'bytes'
+          expect(response.headers['Content-Type']).to eq 'video/webm'
         end
         it "should send the whole thing" do
           request.env["HTTP_RANGE"] = 'bytes=0-15'
           get :show, id: 'changeme:test', datastream_id: 'webm'
-          response.body.should == 'one1two2threfour'
-          response.headers["Content-Range"].should == 'bytes 0-15/16'
-          response.headers["Content-Length"].should == '16'
-          response.headers['Accept-Ranges'].should == 'bytes'
-          response.headers['Content-Type'].should == "video/webm"
-          response.headers["Content-Disposition"].should == "inline; filename=\"MyVideo.webm\""
-          response.status.should == 206
+          expect(response.body).to eq 'one1two2threfour'
+          expect(response.headers["Content-Range"]).to eq 'bytes 0-15/16'
+          expect(response.headers["Content-Length"]).to eq '16'
+          expect(response.headers['Accept-Ranges']).to eq 'bytes'
+          expect(response.headers['Content-Type']).to eq "video/webm"
+          expect(response.headers["Content-Disposition"]).to eq "inline; filename=\"MyVideo.webm\""
+          expect(response.status).to eq 206
         end
         it "should send the whole thing when the range is open ended" do
           request.env["Range"] = 'bytes=0-'
           get :show, id: 'changeme:test', datastream_id: 'webm'
-          response.body.should == 'one1two2threfour'
+          expect(response.body).to eq 'one1two2threfour'
         end
         it "should get a range not starting at the beginning" do
           request.env["HTTP_RANGE"] = 'bytes=3-15'
           get :show, id: 'changeme:test', datastream_id: 'webm'
-          response.body.should == '1two2threfour'
-          response.headers["Content-Range"].should == 'bytes 3-15/16'
-          response.headers["Content-Length"].should == '13'
+          expect(response.body).to eq '1two2threfour'
+          expect(response.headers["Content-Range"]).to eq 'bytes 3-15/16'
+          expect(response.headers["Content-Length"]).to eq '13'
         end
         it "should get a range not ending at the end" do
           request.env["HTTP_RANGE"] = 'bytes=4-11'
           get :show, id: 'changeme:test', datastream_id: 'webm'
-          response.body.should == 'two2thre'
-          response.headers["Content-Range"].should == 'bytes 4-11/16'
-          response.headers["Content-Length"].should == '8'
+          expect(response.body).to eq 'two2thre'
+          expect(response.headers["Content-Range"]).to eq 'bytes 4-11/16'
+          expect(response.headers["Content-Length"]).to eq '8'
         end
       end
     end
@@ -180,9 +180,9 @@ describe DownloadsController do
         sign_in @user
       end
       it "should use the custom param value to retrieve the asset" do
-        controller.stub(:asset_param_key).and_return(:object_id)
+        allow(controller).to receive(:asset_param_key).and_return(:object_id)
         get "show", :object_id => @obj.pid
-        response.should be_successful
+        expect(response).to be_successful
       end
     end
 
@@ -190,8 +190,8 @@ describe DownloadsController do
       before { sign_in @user }
       context "current_ability.can? returns true / can_download? returns false" do
         it "should authorize according to can_download?" do
-          controller.current_ability.can?(:download, @obj.datastreams['buzz']).should be true
-          controller.stub(:can_download?).and_return(false)
+          expect(controller.current_ability.can?(:download, @obj.datastreams['buzz'])).to be true
+          allow(controller).to receive(:can_download?).and_return(false)
           Deprecation.silence(Hydra::Controller::DownloadBehavior) do
             get :show, id: @obj, datastream_id: 'buzz'
           end
@@ -204,12 +204,12 @@ describe DownloadsController do
           @obj.save
         end
         it "should authorize according to can_download?" do
-          controller.current_ability.can?(:download, @obj.datastreams['buzz']).should be false
-          controller.stub(:can_download?).and_return(true)
+          expect(controller.current_ability.can?(:download, @obj.datastreams['buzz'])).to be false
+          allow(controller).to receive(:can_download?).and_return(true)
           Deprecation.silence(Hydra::Controller::DownloadBehavior) do
             get :show, id: @obj, datastream_id: 'buzz'
           end
-          response.should be_successful           
+          expect(response).to be_successful
         end
       end
     end

data/spec/helpers/blacklight_helper_spec.rb

@@ -2,29 +2,32 @@ require 'spec_helper'
 
 describe BlacklightHelper do
   describe "document_partial_name" do
-    it "should lop off everything before the first colin after the slash" do
-      @config = Blacklight::Configuration.new.configure do |config|
-        config.show.display_type_field = 'has_model_s'
+    let(:field_name) { 'has_model_s' }
+
+    let(:config) do
+      Blacklight::Configuration.new.configure do |config|
+        config.show.display_type_field = field_name
       end
-      helper.stub(:blacklight_config).and_return(@config)
-      helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:Presentation"]).should == "presentation"
-      helper.document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"]).should == "generic_content" 
     end
-    it "should support single valued fields" do
-      @config = Blacklight::Configuration.new.configure do |config|
-        config.show.display_type_field = 'active_fedora_model_ssi'
+
+    before do
+      allow(helper).to receive(:blacklight_config).and_return(config)
+    end
+
+    it "should lop off everything before the first colin after the slash" do
+      expect(helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:Presentation"])).to eq "presentation"
+      expect(helper.document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"])).to eq "generic_content"
+    end
+
+    context "with a single valued field" do
+      let(:field_name) { 'active_fedora_model_ssi' }
+      it "should support single valued fields" do
+        expect(helper.document_partial_name('active_fedora_model_ssi' => "Chicken")).to eq "chicken"
       end
-      helper.stub(:blacklight_config).and_return(@config)
-      helper.document_partial_name('active_fedora_model_ssi' => "Chicken").should == "chicken" 
     end
 
     it "should handle periods" do
-      @config = Blacklight::Configuration.new.configure do |config|
-        config.show.display_type_field = 'has_model_s'
-      end
-      helper.stub(:blacklight_config).and_return(@config)
-      helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:text.PDF"]).should == "text_pdf"
+      expect(helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:text.PDF"])).to eq "text_pdf"
     end
   end
-  
 end

data/spec/lib/catalog_spec.rb

@@ -1,16 +1,15 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Hydra::Controller::ControllerBehavior do
-  
-  before(:all) do
+
+  before do
     class CatalogTest < ApplicationController
       include Hydra::Controller::ControllerBehavior
     end
-    @catalog = CatalogTest.new
   end
 
   it "should extend classes with the necessary Hydra modules" do
-    CatalogTest.included_modules.should include(Hydra::AccessControlsEnforcement)
+    expect(CatalogTest.included_modules).to include(Hydra::AccessControlsEnforcement)
   end
-  
+
 end

data/spec/lib/model_methods_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Hydra::ModelMethods do
-  
+
   before :all do
     class TestModel < ActiveFedora::Base
       include Hydra::AccessControls::Permissions
@@ -10,26 +10,26 @@ describe Hydra::ModelMethods do
     end
   end
 
-  subject {TestModel.new }
+  subject { TestModel.new }
 
   describe "apply_depositor_metadata" do
     it "should add edit access" do
       subject.apply_depositor_metadata('naomi')
-      subject.rightsMetadata.users.should == {'naomi' => 'edit'}
+      expect(subject.rightsMetadata.users).to eq('naomi' => 'edit')
     end
     it "should not overwrite people with edit access" do
       subject.rightsMetadata.permissions({:person=>"jessie"}, 'edit')
       subject.apply_depositor_metadata('naomi')
-      subject.rightsMetadata.users.should == {'naomi' => 'edit', 'jessie' =>'edit'}
+      expect(subject.rightsMetadata.users).to eq('naomi' => 'edit', 'jessie' =>'edit')
     end
     it "should set depositor" do
       subject.apply_depositor_metadata('chris')
-      subject.properties.depositor.should == ['chris']
+      expect(subject.properties.depositor).to eq ['chris']
     end
     it "should accept objects that respond_to? :user_key" do
       stub_user = double(:user, :user_key=>'monty')
       subject.apply_depositor_metadata(stub_user)
-      subject.properties.depositor.should == ['monty']
+      expect(subject.properties.depositor).to eq ['monty']
     end
   end
 
@@ -37,9 +37,9 @@ describe Hydra::ModelMethods do
     it "should set the dsid, mimetype and content" do
       file_name = "my_file.foo"
       mock_file = "File contents"
-      subject.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
-      subject.should_receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
-      MIME::Types.should_receive(:of).with(file_name).and_return([double(:content_type=>"mymimetype")])
+      expect(subject).to receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
+      expect(subject).to receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
+      expect(MIME::Types).to receive(:of).with(file_name).and_return([double(:content_type=>"mymimetype")])
       subject.add_file(mock_file, 'bar', file_name)
     end
   end

data/spec/models/mods_asset_spec.rb

@@ -1,21 +1,16 @@
 require 'spec_helper'
 
 describe ModsAsset do
-  
-  before(:each) do
-    @asset = ModsAsset.new nil
-  end
-  
+
+  let(:asset) { ModsAsset.new nil }
+
   it "Should be a kind of ActiveFedora::Base" do
-    @asset.should be_kind_of(ActiveFedora::Base)
+    expect(asset).to be_kind_of(ActiveFedora::Base)
   end
-  
+
   it "should set up descMetadata and rightsMetadata datastreams" do
-    # Mods article was moved to the mods gem.  Ask cbeer about this.  Jcoyne 2012-07-10
-    #@asset.datastreams.should have_key("descMetadata")
-    #@asset.datastreams["descMetadata"].should be_instance_of(Hydra::Datastream::ModsArticle)
-    @asset.datastreams.should have_key("rightsMetadata")
-    @asset.datastreams["rightsMetadata"].should be_instance_of(Hydra::Datastream::RightsMetadata)
+    expect(asset.datastreams).to have_key("rightsMetadata")
+    expect(asset.datastreams["rightsMetadata"]).to be_instance_of(Hydra::Datastream::RightsMetadata)
   end
-  
+
 end

data/spec/models/solr_document_spec.rb

@@ -5,12 +5,13 @@ describe SolrDocument do
 
     before do
       class SolrDocumentWithHydraOverride < SolrDocument
-         include Hydra::Solr::Document
+        include Hydra::Solr::Document
       end
     end
+
     # this isn't a great test, but...
     it "should try to cast the SolrDocument to the Fedora object" do
-      ActiveFedora::Base.should_receive(:load_instance_from_solr).with('asdfg', kind_of(SolrDocument))
+      expect(ActiveFedora::Base).to receive(:load_instance_from_solr).with('asdfg', kind_of(SolrDocument))
       SolrDocumentWithHydraOverride.new(:id => 'asdfg').to_model
     end
   end

data/spec/models/user_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe User do
 
   describe "user_key" do
+    let(:user) { User.new.tap {|u| u.email = "foo@example.com"} }
     before do
-      @user = User.new.tap {|u| u.email = "foo@example.com"}
-      @user.stub(:username =>'foo')
+      allow(user).to receive(:username).and_return('foo')
     end
 
     it "should return email" do
-      @user.user_key.should == 'foo@example.com'
+      expect(user.user_key).to eq 'foo@example.com'
     end
 
     it "should return username" do
-      Devise.stub(:authentication_keys =>[:username])
-      @user.user_key.should == 'foo'
+      allow(Devise).to receive(:authentication_keys).and_return([:username])
+      expect(user.user_key).to eq 'foo'
     end
 
   end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ ENV["RAILS_ENV"] ||= "test"
 require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
 require 'bundler/setup'
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'hydra-core'
 
 if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/

data/spec/support/lib/tasks/rspec.rake

@@ -2,7 +2,6 @@ require 'rspec/core/rake_task'
 desc "run the hydra-core gem spec"
 gem_home = File.expand_path('../../../../..', __FILE__)
 RSpec::Core::RakeTask.new(:myspec) do |t|
-  t.pattern = gem_home + '/spec/**/*_spec.rb'
-  t.rspec_opts = "--colour"
+  t.rspec_opts = ["--colour", '--backtrace', "--default-path #{gem_home}"]
   t.ruby_opts = "-I#{gem_home}/spec"
 end

data/spec/test_app_templates/Gemfile.extra

@@ -1,8 +1,6 @@
 group :develop do
   gem 'active-fedora', github: "projecthydra/active_fedora"
 end
-# Temporary fix for https://github.com/twbs/bootstrap-sass/issues/647 on Rails 3
-gem 'bootstrap-sass', github: 'twbs/bootstrap-sass', ref: '540ad23'
-gem 'rspec-rails', '~> 3.0', group: :test
+gem 'rspec-rails', '~> 3.1', group: :test
 gem 'rspec-its'
 

data/spec/unit/hydra-head-engine_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe HydraHead::Engine do
   it "should be a subclass of Rails::Engine" do
-    HydraHead::Engine.superclass.should == Rails::Engine
+    expect(HydraHead::Engine.superclass).to eq Rails::Engine
   end
 end

data/spec/unit/hydra-head_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe HydraHead do
   it "should be valid" do
-    HydraHead.should be_a(Module)
+    expect(HydraHead).to be_a(Module)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.1
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.1
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)