configuration_spec.rb in authority-2.3.0

- old
+ new

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe Authority::Configuration do
   describe "the default configuration" do
 
-    it "should have a default authority controller actions map" do
-      Authority.configuration.controller_action_map.should be_a(Hash)
+    it "has a default authority controller actions map" do
+      expect(Authority.configuration.controller_action_map).to be_a(Hash)
     end
 
-    it "should have a default controller method for accessing the user object" do
-      Authority.configuration.user_method.should eq(:current_user)
+    it "has a default controller method for accessing the user object" do
+      expect(Authority.configuration.user_method).to eq(:current_user)
     end
 
     describe "logging security violations" do
 
-      it "should log to standard error by default" do
+      it "logs to standard error by default" do
         Authority.instance_variable_set :@configuration, nil
         null = File.exists?('/dev/null') ? '/dev/null' : 'NUL:' # Allow for Windows
-        @logger = Logger.new(null)
-        Logger.should_receive(:new).with(STDERR).and_return(@logger)
+        logger = Logger.new(null)
+        Logger.should_receive(:new).with(STDERR).and_return(logger)
         Authority.configure
         Authority.configuration.logger
       end
 
     end
@@ -38,23 +38,23 @@
         Authority.configure
       end
 
       # This shouldn't be used during runtime, only during configuration
       # It won't do anything outside of configuration anyway
-      it "should allow adding to the default list of abilities" do
-        Authority.configuration.abilities[:eat].should eq('edible')
+      it "allows adding to the default list of abilities" do
+        expect(Authority.configuration.abilities[:eat]).to eq('edible')
       end
 
     end
   end
 
-  describe "helping those upgrading to 2.0" do
+  describe "helping those upgrading from versions prior to 2.0" do
 
     before :all do
       Authority.instance_variable_set :@configuration, nil
     end
 
-    it "should raise a helpful exception if `config.default_strategy` is called" do
+    it "raises a helpful exception if `config.default_strategy` is called" do
       expect { Authority.configure { |config| config.default_strategy = Proc.new { false }}}.to raise_error(
         ArgumentError, "`config.default_strategy=` was removed in Authority 2.0; see README and CHANGELOG"
       )
     end
 