active-fedora 6.7.8 → 6.8.0

data/spec/unit/file_configurator_spec.rb

@@ -2,370 +2,370 @@ require 'spec_helper'
 require 'config_helper'
 
 describe ActiveFedora::FileConfigurator do
-  
+
   subject {ActiveFedora.configurator }
-  
+
   after :all do
     unstub_rails
     # Restore to default fedora configs
     restore_spec_configuration
   end
 
-  describe "#initialize" do
-    it "should trigger configuration reset (to empty defaults)" do
-      ActiveFedora::FileConfigurator.any_instance.should_receive(:reset!)
+  describe '#initialize' do
+    it 'should trigger configuration reset (to empty defaults)' do
+      expect_any_instance_of(ActiveFedora::FileConfigurator).to receive(:reset!)
       ActiveFedora::FileConfigurator.new
-    end 
+    end
   end
 
-  describe "#config_options" do
+  describe '#config_options' do
     before do
       subject.reset!
     end
-    it "should be an empty hash" do
-      subject.config_options.should == {}
+    it 'should be an empty hash' do
+      expect(subject.config_options).to eq({})
     end
   end
 
-  describe "#fedora_config" do
+  describe '#fedora_config' do
     before do
       subject.reset!
     end
-    it "should trigger configuration to load" do
-      subject.should_receive(:load_fedora_config)
+    it 'should trigger configuration to load' do
+      expect(subject).to receive(:load_fedora_config)
       subject.fedora_config
-    end 
+    end
   end
-  describe "#solr_config" do
+  describe '#solr_config' do
     before do
       subject.reset!
     end
-    it "should trigger configuration to load" do
-      subject.should_receive(:load_solr_config)
+    it 'should trigger configuration to load' do
+      expect(subject).to receive(:load_solr_config)
       subject.solr_config
-    end 
+    end
   end
 
-  describe "#reset!" do
+  describe '#reset!' do
     before { subject.reset! }
-    it "should clear @fedora_config" do
-      subject.instance_variable_get(:@fedora_config).should == {} 
+    it 'should clear @fedora_config' do
+      expect(subject.instance_variable_get(:@fedora_config)).to eq({})
     end
-    it "should clear @solr_config" do
-      subject.instance_variable_get(:@solr_config).should == {} 
+    it 'should clear @solr_config' do
+      expect(subject.instance_variable_get(:@solr_config)).to eq({})
     end
-    it "should clear @config_options" do
-      subject.instance_variable_get(:@config_options).should == {}
+    it 'should clear @config_options' do
+      expect(subject.instance_variable_get(:@config_options)).to eq({})
     end
   end
 
-  describe "initialization methods" do
-    
-    describe "get_config_path(:fedora)" do
-      it "should use the config_options[:config_path] if it exists" do
-        subject.should_receive(:config_options).and_return({:fedora_config_path => "/path/to/fedora.yml"})
-        File.should_receive(:file?).with("/path/to/fedora.yml").and_return(true)
-        subject.get_config_path(:fedora).should eql("/path/to/fedora.yml")
+  describe 'initialization methods' do
+
+    describe 'get_config_path(:fedora)' do
+      it 'should use the config_options[:config_path] if it exists' do
+        expect(subject).to receive(:config_options).and_return({:fedora_config_path => '/path/to/fedora.yml'})
+        expect(File).to receive(:file?).with('/path/to/fedora.yml').and_return(true)
+        expect(subject.get_config_path(:fedora)).to eql('/path/to/fedora.yml')
       end
 
-      it "should look in Rails.root/config/fedora.yml if it exists and no fedora_config_path passed in" do
-        subject.should_receive(:config_options).and_return({})
-        stub_rails(:root => "/rails/root")
-        File.should_receive(:file?).with("/rails/root/config/fedora.yml").and_return(true)
-        subject.get_config_path(:fedora).should eql("/rails/root/config/fedora.yml")
+      it 'should look in Rails.root/config/fedora.yml if it exists and no fedora_config_path passed in' do
+        expect(subject).to receive(:config_options).and_return({})
+        stub_rails(:root => '/rails/root')
+        expect(File).to receive(:file?).with('/rails/root/config/fedora.yml').and_return(true)
+        expect(subject.get_config_path(:fedora)).to eql('/rails/root/config/fedora.yml')
         unstub_rails
       end
 
-      it "should look in ./config/fedora.yml if neither rails.root nor :fedora_config_path are set" do
-        subject.should_receive(:config_options).and_return({})
-        Dir.stub(:getwd => "/current/working/directory")
-        File.should_receive(:file?).with("/current/working/directory/config/fedora.yml").and_return(true)
-        subject.get_config_path(:fedora).should eql("/current/working/directory/config/fedora.yml")
+      it 'should look in ./config/fedora.yml if neither rails.root nor :fedora_config_path are set' do
+        expect(subject).to receive(:config_options).and_return({})
+        Dir.stub(:getwd => '/current/working/directory')
+        expect(File).to receive(:file?).with('/current/working/directory/config/fedora.yml').and_return(true)
+        expect(subject.get_config_path(:fedora)).to eql('/current/working/directory/config/fedora.yml')
       end
 
-      it "should return default fedora.yml that ships with active-fedora if none of the above" do
-        subject.should_receive(:config_options).and_return({})
-        Dir.should_receive(:getwd).and_return("/current/working/directory")
-        File.should_receive(:file?).with("/current/working/directory/config/fedora.yml").and_return(false)
-        File.should_receive(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"),'config','fedora.yml'))).and_return(true)
-        logger.should_receive(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.")
-        subject.get_config_path(:fedora).should eql(File.expand_path(File.join(File.dirname("__FILE__"),'config','fedora.yml')))
+      it 'should return default fedora.yml that ships with active-fedora if none of the above' do
+        expect(subject).to receive(:config_options).and_return({})
+        expect(Dir).to receive(:getwd).and_return('/current/working/directory')
+        expect(File).to receive(:file?).with('/current/working/directory/config/fedora.yml').and_return(false)
+        expect(File).to receive(:file?).with(File.expand_path(File.join(File.dirname('__FILE__'), 'config', 'fedora.yml'))).and_return(true)
+        expect(logger).to receive(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.")
+        expect(subject.get_config_path(:fedora)).to eql(File.expand_path(File.join(File.dirname('__FILE__'), 'config', 'fedora.yml')))
       end
     end
 
-    describe "get_config_path(:predicate_mappings)" do
-      it "should use the config_options[:config_path] if it exists" do
-        subject.should_receive(:config_options).and_return({:predicate_mappings_config_path => "/path/to/predicate_mappings.yml"})
-        File.should_receive(:file?).with("/path/to/predicate_mappings.yml").and_return(true)
-        subject.get_config_path(:predicate_mappings).should eql("/path/to/predicate_mappings.yml")
+    describe 'get_config_path(:predicate_mappings)' do
+      it 'should use the config_options[:config_path] if it exists' do
+        expect(subject).to receive(:config_options).and_return({:predicate_mappings_config_path => '/path/to/predicate_mappings.yml'})
+        expect(File).to receive(:file?).with('/path/to/predicate_mappings.yml').and_return(true)
+        expect(subject.get_config_path(:predicate_mappings)).to eql('/path/to/predicate_mappings.yml')
       end
 
-      it "should look in Rails.root/config/predicate_mappings.yml if it exists and no predicate_mappings_config_path passed in" do
-        subject.should_receive(:config_options).and_return({})
-        stub_rails(:root => "/rails/root")
-        File.should_receive(:file?).with("/rails/root/config/predicate_mappings.yml").and_return(true)
-        subject.get_config_path(:predicate_mappings).should eql("/rails/root/config/predicate_mappings.yml")
+      it 'should look in Rails.root/config/predicate_mappings.yml if it exists and no predicate_mappings_config_path passed in' do
+        expect(subject).to receive(:config_options).and_return({})
+        stub_rails(:root => '/rails/root')
+        expect(File).to receive(:file?).with('/rails/root/config/predicate_mappings.yml').and_return(true)
+        expect(subject.get_config_path(:predicate_mappings)).to eql('/rails/root/config/predicate_mappings.yml')
         unstub_rails
       end
 
-      it "should look in ./config/predicate_mappings.yml if neither rails.root nor :predicate_mappings_config_path are set" do
-        subject.should_receive(:config_options).and_return({})
-        Dir.stub(:getwd => "/current/working/directory")
-        File.should_receive(:file?).with("/current/working/directory/config/predicate_mappings.yml").and_return(true)
-        subject.get_config_path(:predicate_mappings).should eql("/current/working/directory/config/predicate_mappings.yml")
+      it 'should look in ./config/predicate_mappings.yml if neither rails.root nor :predicate_mappings_config_path are set' do
+        expect(subject).to receive(:config_options).and_return({})
+        Dir.stub(:getwd => '/current/working/directory')
+        expect(File).to receive(:file?).with('/current/working/directory/config/predicate_mappings.yml').and_return(true)
+        expect(subject.get_config_path(:predicate_mappings)).to eql('/current/working/directory/config/predicate_mappings.yml')
       end
 
-      it "should return default predicate_mappings.yml that ships with active-fedora if none of the above" do
-        subject.should_receive(:config_options).and_return({})
-        Dir.should_receive(:getwd).and_return("/current/working/directory")
-        File.should_receive(:file?).with("/current/working/directory/config/predicate_mappings.yml").and_return(false)
-        File.should_receive(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"),'config','predicate_mappings.yml'))).and_return(true)
-        logger.should_receive(:warn).with("Using the default predicate_mappings.yml that comes with active-fedora.  If you want to override this, pass the path to predicate_mappings.yml to ActiveFedora - ie. ActiveFedora.init(:predicate_mappings_config_path => '/path/to/predicate_mappings.yml') - or set Rails.root and put predicate_mappings.yml into \#{Rails.root}/config.")
-        subject.get_config_path(:predicate_mappings).should eql(File.expand_path(File.join(File.dirname("__FILE__"),'config','predicate_mappings.yml')))
+      it 'should return default predicate_mappings.yml that ships with active-fedora if none of the above' do
+        expect(subject).to receive(:config_options).and_return({})
+        expect(Dir).to receive(:getwd).and_return('/current/working/directory')
+        expect(File).to receive(:file?).with('/current/working/directory/config/predicate_mappings.yml').and_return(false)
+        expect(File).to receive(:file?).with(File.expand_path(File.join(File.dirname('__FILE__'), 'config', 'predicate_mappings.yml'))).and_return(true)
+        expect(logger).to receive(:warn).with("Using the default predicate_mappings.yml that comes with active-fedora.  If you want to override this, pass the path to predicate_mappings.yml to ActiveFedora - ie. ActiveFedora.init(:predicate_mappings_config_path => '/path/to/predicate_mappings.yml') - or set Rails.root and put predicate_mappings.yml into \#{Rails.root}/config.")
+        expect(subject.get_config_path(:predicate_mappings)).to eql(File.expand_path(File.join(File.dirname('__FILE__'), 'config', 'predicate_mappings.yml')))
       end
     end
 
-    describe "get_config_path(:solr)" do
-      it "should return the solr_config_path if set in config_options hash" do
-        subject.stub(:config_options => {:solr_config_path => "/path/to/solr.yml"})
-        File.should_receive(:file?).with("/path/to/solr.yml").and_return(true)
-        subject.get_config_path(:solr).should eql("/path/to/solr.yml")
+    describe 'get_config_path(:solr)' do
+      it 'should return the solr_config_path if set in config_options hash' do
+        subject.stub(:config_options => {:solr_config_path => '/path/to/solr.yml'})
+        expect(File).to receive(:file?).with('/path/to/solr.yml').and_return(true)
+        expect(subject.get_config_path(:solr)).to eql('/path/to/solr.yml')
       end
-      
-      it "should return the solr.yml file in the same directory as the fedora.yml if it exists" do
-        subject.should_receive(:path).and_return("/path/to/fedora/config/fedora.yml")
-        File.should_receive(:file?).with("/path/to/fedora/config/solr.yml").and_return(true)
-        subject.get_config_path(:solr).should eql("/path/to/fedora/config/solr.yml")
+
+      it 'should return the solr.yml file in the same directory as the fedora.yml if it exists' do
+        expect(subject).to receive(:path).and_return('/path/to/fedora/config/fedora.yml')
+        expect(File).to receive(:file?).with('/path/to/fedora/config/solr.yml').and_return(true)
+        expect(subject.get_config_path(:solr)).to eql('/path/to/fedora/config/solr.yml')
       end
-      
-      context "no solr.yml in same directory as fedora.yml and fedora.yml does not contain solr url" do
+
+      context 'no solr.yml in same directory as fedora.yml and fedora.yml does not contain solr url' do
 
         before :each do
           subject.stub(:config_options => {})
-          subject.should_receive(:path).and_return("/path/to/fedora/config/fedora.yml")
-          File.should_receive(:file?).with("/path/to/fedora/config/solr.yml").and_return(false)
+          expect(subject).to receive(:path).and_return('/path/to/fedora/config/fedora.yml')
+          expect(File).to receive(:file?).with('/path/to/fedora/config/solr.yml').and_return(false)
         end
         after :each do
           unstub_rails
         end
 
-        it "should not raise an error if there is not a solr.yml in the same directory as the fedora.yml and the fedora.yml has a solr url defined and look in rails.root" do
-          stub_rails(:root=>"/rails/root")
-          File.should_receive(:file?).with("/rails/root/config/solr.yml").and_return(true)
-          subject.get_config_path(:solr).should eql("/rails/root/config/solr.yml")
+        it 'should not raise an error if there is not a solr.yml in the same directory as the fedora.yml and the fedora.yml has a solr url defined and look in rails.root' do
+          stub_rails(:root => '/rails/root')
+          expect(File).to receive(:file?).with('/rails/root/config/solr.yml').and_return(true)
+          expect(subject.get_config_path(:solr)).to eql('/rails/root/config/solr.yml')
         end
 
-        it "should look in ./config/solr.yml if no rails root" do
-          Dir.stub(:getwd => "/current/working/directory")
-          File.should_receive(:file?).with("/current/working/directory/config/solr.yml").and_return(true)
-          subject.get_config_path(:solr).should eql("/current/working/directory/config/solr.yml")
+        it 'should look in ./config/solr.yml if no rails root' do
+          Dir.stub(:getwd => '/current/working/directory')
+          expect(File).to receive(:file?).with('/current/working/directory/config/solr.yml').and_return(true)
+          expect(subject.get_config_path(:solr)).to eql('/current/working/directory/config/solr.yml')
         end
 
-        it "should return the default solr.yml file that ships with active-fedora if no other option is set" do
-          Dir.stub(:getwd => "/current/working/directory")
-          File.should_receive(:file?).with("/current/working/directory/config/solr.yml").and_return(false)
-          File.should_receive(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"),'config','solr.yml'))).and_return(true)
-          logger.should_receive(:warn).with("Using the default solr.yml that comes with active-fedora.  If you want to override this, pass the path to solr.yml to ActiveFedora - ie. ActiveFedora.init(:solr_config_path => '/path/to/solr.yml') - or set Rails.root and put solr.yml into \#{Rails.root}/config.")
-          subject.get_config_path(:solr).should eql(File.expand_path(File.join(File.dirname("__FILE__"),'config','solr.yml')))
+        it 'should return the default solr.yml file that ships with active-fedora if no other option is set' do
+          Dir.stub(:getwd => '/current/working/directory')
+          expect(File).to receive(:file?).with('/current/working/directory/config/solr.yml').and_return(false)
+          expect(File).to receive(:file?).with(File.expand_path(File.join(File.dirname('__FILE__'), 'config', 'solr.yml'))).and_return(true)
+          expect(logger).to receive(:warn).with("Using the default solr.yml that comes with active-fedora.  If you want to override this, pass the path to solr.yml to ActiveFedora - ie. ActiveFedora.init(:solr_config_path => '/path/to/solr.yml') - or set Rails.root and put solr.yml into \#{Rails.root}/config.")
+          expect(subject.get_config_path(:solr)).to eql(File.expand_path(File.join(File.dirname('__FILE__'), 'config', 'solr.yml')))
         end
       end
 
     end
 
-    describe "load_fedora_config" do
+    describe 'load_fedora_config' do
       before(:each) do
         subject.reset!
       end
-      it "should load the file specified in fedora_config_path" do
-        subject.stub(:load_solrizer_config)
-        subject.should_receive(:get_config_path).with(:fedora).and_return("/path/to/fedora.yml")
-        subject.should_receive(:load_solr_config)
-        IO.should_receive(:read).with("/path/to/fedora.yml").and_return("development:\n url: http://devfedora:8983\ntest:\n  url: http://myfedora:8080")
-        subject.load_fedora_config.should == {:url=>"http://myfedora:8080"}
-        subject.fedora_config.should == {:url=>"http://myfedora:8080"}
+      it 'should load the file specified in fedora_config_path' do
+        allow(subject).to receive(:load_solrizer_config)
+        expect(subject).to receive(:get_config_path).with(:fedora).and_return('/path/to/fedora.yml')
+        expect(subject).to receive(:load_solr_config)
+        expect(IO).to receive(:read).with('/path/to/fedora.yml').and_return("development:\n url: http://devfedora:8983\ntest:\n  url: http://myfedora:8080")
+        expect(subject.load_fedora_config).to eq({:url => 'http://myfedora:8080'})
+        expect(subject.fedora_config).to eq({:url => 'http://myfedora:8080'})
       end
 
-      it "should allow sharding" do
-        subject.stub(:load_solrizer_config)
-        subject.should_receive(:get_config_path).with(:fedora).and_return("/path/to/fedora.yml")
-        subject.should_receive(:load_solr_config)
-        IO.should_receive(:read).with("/path/to/fedora.yml").and_return("development:\n  url: http://devfedora:8983\ntest:\n- url: http://myfedora:8080\n- url: http://myfedora:8081")
-        subject.load_fedora_config.should == [{:url=>"http://myfedora:8080"}, {:url=>"http://myfedora:8081"}]
-        subject.fedora_config.should == [{:url=>"http://myfedora:8080"}, {:url=>"http://myfedora:8081"}]
+      it 'should allow sharding' do
+        allow(subject).to receive(:load_solrizer_config)
+        expect(subject).to receive(:get_config_path).with(:fedora).and_return('/path/to/fedora.yml')
+        expect(subject).to receive(:load_solr_config)
+        expect(IO).to receive(:read).with('/path/to/fedora.yml').and_return("development:\n  url: http://devfedora:8983\ntest:\n- url: http://myfedora:8080\n- url: http://myfedora:8081")
+        expect(subject.load_fedora_config).to eq([{:url => 'http://myfedora:8080'}, {:url => 'http://myfedora:8081'}])
+        expect(subject.fedora_config).to eq([{:url => 'http://myfedora:8080'}, {:url => 'http://myfedora:8081'}])
       end
 
-      it "should parse the file using ERb" do
-        subject.stub(:load_solrizer_config)
-        subject.should_receive(:get_config_path).with(:fedora).and_return("/path/to/fedora.yml")
-        subject.should_receive(:load_solr_config)
-        IO.should_receive(:read).with("/path/to/fedora.yml").and_return("development:\n  url: http://devfedora:<%= 8983 %>\ntest:\n  url: http://myfedora:<%= 8081 %>")
-        subject.load_fedora_config.should == {:url=>"http://myfedora:8081"}
-        subject.fedora_config.should == {:url=>"http://myfedora:8081"}
+      it 'should parse the file using ERb' do
+        allow(subject).to receive(:load_solrizer_config)
+        expect(subject).to receive(:get_config_path).with(:fedora).and_return('/path/to/fedora.yml')
+        expect(subject).to receive(:load_solr_config)
+        expect(IO).to receive(:read).with('/path/to/fedora.yml').and_return("development:\n  url: http://devfedora:<%= 8983 %>\ntest:\n  url: http://myfedora:<%= 8081 %>")
+        expect(subject.load_fedora_config).to eq({:url => 'http://myfedora:8081'})
+        expect(subject.fedora_config).to eq({:url => 'http://myfedora:8081'})
       end
     end
 
-    describe "load_solr_config" do
+    describe 'load_solr_config' do
       before(:each) do
         subject.reset!
       end
-      it "should load the file specified in solr_config_path" do
-        subject.stub(:load_solrizer_config)
-        subject.should_receive(:get_config_path).with(:solr).and_return("/path/to/solr.yml")
-        subject.should_receive(:load_fedora_config)
-        IO.should_receive(:read).with("/path/to/solr.yml").and_return("development:\n  default:\n    url: http://devsolr:8983\ntest:\n  default:\n    url: http://mysolr:8080")
-        subject.load_solr_config.should == {:url=>"http://mysolr:8080"}
-        subject.solr_config.should == {:url=>"http://mysolr:8080"}
+      it 'should load the file specified in solr_config_path' do
+        allow(subject).to receive(:load_solrizer_config)
+        expect(subject).to receive(:get_config_path).with(:solr).and_return('/path/to/solr.yml')
+        expect(subject).to receive(:load_fedora_config)
+        expect(IO).to receive(:read).with('/path/to/solr.yml').and_return("development:\n  default:\n    url: http://devsolr:8983\ntest:\n  default:\n    url: http://mysolr:8080")
+        expect(subject.load_solr_config).to eq({:url => 'http://mysolr:8080'})
+        expect(subject.solr_config).to eq({:url => 'http://mysolr:8080'})
       end
 
-      it "should parse the file using ERb" do
-        subject.stub(:load_solrizer_config)
-        subject.should_receive(:get_config_path).with(:solr).and_return("/path/to/solr.yml")
-        subject.should_receive(:load_fedora_config)
-        IO.should_receive(:read).with("/path/to/solr.yml").and_return("development:\n  default:\n    url: http://devsolr:<%= 8983 %>\ntest:\n  default:\n    url: http://mysolr:<%= 8081 %>")
-        subject.load_solr_config.should == {:url=>"http://mysolr:8081"}
-        subject.solr_config.should == {:url=>"http://mysolr:8081"}
+      it 'should parse the file using ERb' do
+        allow(subject).to receive(:load_solrizer_config)
+        expect(subject).to receive(:get_config_path).with(:solr).and_return('/path/to/solr.yml')
+        expect(subject).to receive(:load_fedora_config)
+        expect(IO).to receive(:read).with('/path/to/solr.yml').and_return("development:\n  default:\n    url: http://devsolr:<%= 8983 %>\ntest:\n  default:\n    url: http://mysolr:<%= 8081 %>")
+        expect(subject.load_solr_config).to eq({:url => 'http://mysolr:8081'})
+        expect(subject.solr_config).to eq({:url => 'http://mysolr:8081'})
       end
     end
 
-    describe "load_configs" do
-      describe "when config is not loaded" do
+    describe 'load_configs' do
+      describe 'when config is not loaded' do
         before do
           subject.instance_variable_set :@config_loaded, nil
         end
-        it "should load the fedora and solr configs" do
-          subject.config_loaded?.should be_false
+        it 'should load the fedora and solr configs' do
+          expect(subject.config_loaded?).to be_falsey
           subject.load_configs
-          subject.config_loaded?.should be_true
+          expect(subject.config_loaded?).to be_truthy
         end
       end
-      describe "when config is loaded" do
+      describe 'when config is loaded' do
         before do
           subject.instance_variable_set :@config_loaded, true
         end
-        it "should load the fedora and solr configs" do
-          subject.should_receive(:load_config).never
-          subject.config_loaded?.should be_true
+        it 'should load the fedora and solr configs' do
+          expect(subject).to receive(:load_config).never
+          expect(subject.config_loaded?).to be_truthy
           subject.load_configs
-          subject.config_loaded?.should be_true
+          expect(subject.config_loaded?).to be_truthy
         end
       end
     end
 
-    describe "check_fedora_path_for_solr" do
-      it "should find the solr.yml file and return it if it exists" do
-        subject.should_receive(:path).and_return("/path/to/fedora/fedora.yml")
-        File.should_receive(:file?).with("/path/to/fedora/solr.yml").and_return(true)
-        subject.check_fedora_path_for_solr.should == "/path/to/fedora/solr.yml"
+    describe 'check_fedora_path_for_solr' do
+      it 'should find the solr.yml file and return it if it exists' do
+        expect(subject).to receive(:path).and_return('/path/to/fedora/fedora.yml')
+        expect(File).to receive(:file?).with('/path/to/fedora/solr.yml').and_return(true)
+        expect(subject.check_fedora_path_for_solr).to eq('/path/to/fedora/solr.yml')
       end
-      it "should return nil if the solr.yml file is not there" do
-        subject.should_receive(:path).and_return("/path/to/fedora/fedora.yml")
-        File.should_receive(:file?).with("/path/to/fedora/solr.yml").and_return(false)
-        subject.check_fedora_path_for_solr.should be_nil
+      it 'should return nil if the solr.yml file is not there' do
+        expect(subject).to receive(:path).and_return('/path/to/fedora/fedora.yml')
+        expect(File).to receive(:file?).with('/path/to/fedora/solr.yml').and_return(false)
+        expect(subject.check_fedora_path_for_solr).to be_nil
       end
     end
   end
-  
-  describe "setting the environment and loading configuration" do
-    
+
+  describe 'setting the environment and loading configuration' do
+
     before(:all) do
       @fake_rails_root = File.expand_path(File.dirname(__FILE__) + '/../fixtures/rails_root')
     end
 
-    
+
     after(:all) do
-      config_file = File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml")
-      environment = "test"
-      ActiveFedora.init(:environment=>environment, :fedora_config_path=>config_file)
+      config_file = File.join(File.dirname(__FILE__), '..', '..', 'config', 'fedora.yml')
+      environment = 'test'
+      ActiveFedora.init(:environment => environment, :fedora_config_path => config_file)
     end
-  
-    it "can tell its config paths" do
+
+    it 'can tell its config paths' do
       subject.init
-      subject.should respond_to(:solr_config_path)
+      expect(subject).to respond_to(:solr_config_path)
     end
-    it "loads a config from the current working directory as a second choice" do
-      subject.stub(:load_solrizer_config)
-      Dir.stub(:getwd).and_return(@fake_rails_root)
+    it 'loads a config from the current working directory as a second choice' do
+      allow(subject).to receive(:load_solrizer_config)
+      allow(Dir).to receive(:getwd).and_return(@fake_rails_root)
       subject.init
-      subject.get_config_path(:fedora).should eql("#{@fake_rails_root}/config/fedora.yml")
-      subject.solr_config_path.should eql("#{@fake_rails_root}/config/solr.yml")
+      expect(subject.get_config_path(:fedora)).to eql("#{@fake_rails_root}/config/fedora.yml")
+      expect(subject.solr_config_path).to eql("#{@fake_rails_root}/config/solr.yml")
     end
-    it "loads the config that ships with this gem as a last choice" do
-      Dir.stub(:getwd).and_return("/fake/path")
-      subject.stub(:load_solrizer_config)
-      logger.should_receive(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.").exactly(3).times
+    it 'loads the config that ships with this gem as a last choice' do
+      allow(Dir).to receive(:getwd).and_return('/fake/path')
+      allow(subject).to receive(:load_solrizer_config)
+      expect(logger).to receive(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.").exactly(3).times
       subject.init
-      expected_config = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
-      subject.get_config_path(:fedora).should eql(expected_config+'/fedora.yml')
-      subject.solr_config_path.should eql(expected_config+'/solr.yml')
+      expected_config = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config'))
+      expect(subject.get_config_path(:fedora)).to eql(expected_config + '/fedora.yml')
+      expect(subject.solr_config_path).to eql(expected_config + '/solr.yml')
     end
-    it "raises an error if you pass in a string" do
-      lambda{ subject.init("#{@fake_rails_root}/config/fake_fedora.yml") }.should raise_exception(ArgumentError)
+    it 'raises an error if you pass in a string' do
+      expect{ subject.init("#{@fake_rails_root}/config/fake_fedora.yml") }.to raise_exception(ArgumentError)
     end
-    it "raises an error if you pass in a non-existant config file" do
-      lambda{ subject.init(:fedora_config_path=>"really_fake_fedora.yml") }.should raise_exception(ActiveFedora::ConfigurationError)
+    it 'raises an error if you pass in a non-existant config file' do
+      expect{ subject.init(:fedora_config_path => 'really_fake_fedora.yml') }.to raise_exception(ActiveFedora::ConfigurationError)
     end
-    
-    describe "within Rails" do
-      before(:all) do        
-        stub_rails(:root=>File.dirname(__FILE__) + '/../fixtures/rails_root')
+
+    describe 'within Rails' do
+      before(:all) do
+        stub_rails(:root => File.dirname(__FILE__) + '/../fixtures/rails_root')
       end
 
       after(:all) do
         unstub_rails
       end
-      
-      it "loads a config from Rails.root as a first choice" do
-        subject.stub(:load_solrizer_config)
+
+      it 'loads a config from Rails.root as a first choice' do
+        allow(subject).to receive(:load_solrizer_config)
         subject.init
-        subject.get_config_path(:fedora).should eql("#{Rails.root}/config/fedora.yml")
-        subject.solr_config_path.should eql("#{Rails.root}/config/solr.yml")
+        expect(subject.get_config_path(:fedora)).to eql("#{Rails.root}/config/fedora.yml")
+        expect(subject.solr_config_path).to eql("#{Rails.root}/config/solr.yml")
       end
-      
-      it "can tell what environment it is set to run in" do
-        stub_rails(:env=>"development")
+
+      it 'can tell what environment it is set to run in' do
+        stub_rails(:env => 'development')
         subject.init
-        ActiveFedora.environment.should eql("development")
+        expect(ActiveFedora.environment).to eql('development')
       end
-      
+
     end
   end
-  
+
   ##########################
-  
-  describe ".build_predicate_config_path" do
-    it "should return the path to the default config/predicate_mappings.yml if no valid path is given" do
-      subject.send(:build_predicate_config_path).should == default_predicate_mapping_file
+
+  describe '.build_predicate_config_path' do
+    it 'should return the path to the default config/predicate_mappings.yml if no valid path is given' do
+      expect(subject.send(:build_predicate_config_path)).to eq(default_predicate_mapping_file)
     end
   end
 
-  describe ".predicate_config" do
+  describe '.predicate_config' do
     before do
       subject.instance_variable_set :@config_loaded, nil
     end
-    it "should return the default mapping if it has not been initialized" do
-      subject.predicate_config().should == YAMLAdaptor.load(File.read(default_predicate_mapping_file))
+    it 'should return the default mapping if it has not been initialized' do
+      expect(subject.predicate_config()).to eq(YAMLAdaptor.load(File.read(default_predicate_mapping_file)))
     end
   end
 
-  describe ".valid_predicate_mapping" do
-    it "should return true if the predicate mapping has the appropriate keys and value types" do
-      subject.send(:valid_predicate_mapping?,default_predicate_mapping_file).should be_true
+  describe '.valid_predicate_mapping' do
+    it 'should return true if the predicate mapping has the appropriate keys and value types' do
+      expect(subject.send(:valid_predicate_mapping?, default_predicate_mapping_file)).to be_truthy
     end
-    it "should return false if the mapping is missing the :default_namespace" do
-      mock_yaml({:default_namespace0=>"my_namespace",:predicate_mapping=>{:key0=>"value0", :key1=>"value1"}},"/path/to/predicate_mappings.yml")
-      subject.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
+    it 'should return false if the mapping is missing the :default_namespace' do
+      mock_yaml({:default_namespace0 => 'my_namespace', :predicate_mapping => {:key0 => 'value0', :key1 => 'value1'}}, '/path/to/predicate_mappings.yml')
+      expect(subject.send(:valid_predicate_mapping?, '/path/to/predicate_mappings.yml')).to be_falsey
     end
-    it "should return false if the :default_namespace is not a string" do
-      mock_yaml({:default_namespace=>{:foo=>"bar"}, :predicate_mapping=>{:key0=>"value0", :key1=>"value1"}},"/path/to/predicate_mappings.yml")
-      subject.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
+    it 'should return false if the :default_namespace is not a string' do
+      mock_yaml({:default_namespace => {:foo => 'bar'}, :predicate_mapping => {:key0 => 'value0', :key1 => 'value1'}}, '/path/to/predicate_mappings.yml')
+      expect(subject.send(:valid_predicate_mapping?, '/path/to/predicate_mappings.yml')).to be_falsey
     end
-    it "should return false if the :predicate_mappings key is missing" do
-      mock_yaml({:default_namespace=>"a string"},"/path/to/predicate_mappings.yml")
-      subject.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
+    it 'should return false if the :predicate_mappings key is missing' do
+      mock_yaml({:default_namespace => 'a string'}, '/path/to/predicate_mappings.yml')
+      expect(subject.send(:valid_predicate_mapping?, '/path/to/predicate_mappings.yml')).to be_falsey
     end
-    it "should return false if the :predicate_mappings key is not a hash" do
-      mock_yaml({:default_namespace=>"a string",:predicate_mapping=>"another string"},"/path/to/predicate_mappings.yml")
-      subject.send(:valid_predicate_mapping?,"/path/to/predicate_mappings.yml").should be_false
+    it 'should return false if the :predicate_mappings key is not a hash' do
+      mock_yaml({:default_namespace => 'a string', :predicate_mapping => 'another string'}, '/path/to/predicate_mappings.yml')
+      expect(subject.send(:valid_predicate_mapping?, '/path/to/predicate_mappings.yml')).to be_falsey
     end
 
   end