spec/warden/test/helpers_spec.rb in warden-1.2.3 vs spec/warden/test/helpers_spec.rb in warden-1.2.4

@@ -8,66 +8,66 @@
   it "should log me in as a user" do
     user = "A User"
     login_as user
     app = lambda{|e|
       $captures << :run
-      e['warden'].should be_authenticated
-      e['warden'].user.should == "A User"
+      expect(e['warden']).to be_authenticated
+      expect(e['warden'].user).to eq("A User")
       valid_response
     }
     setup_rack(app).call(env_with_params)
-    $captures.should == [:run]
+    expect($captures).to eq([:run])
   end
 
   it "should log me in as a user of a given scope" do
     user = {:some => "user"}
     login_as user, :scope => :foo_scope
     app = lambda{|e|
       $captures << :run
       w = e['warden']
-      w.should be_authenticated(:foo_scope)
-      w.user(:foo_scope).should == {:some => "user"}
+      expect(w).to be_authenticated(:foo_scope)
+      expect(w.user(:foo_scope)).to eq(some: "user")
     }
     setup_rack(app).call(env_with_params)
-    $captures.should == [:run]
+    expect($captures).to eq([:run])
   end
 
   it "should login multiple users with different scopes" do
     user      = "A user"
     foo_user  = "A foo user"
     login_as user
     login_as foo_user, :scope => :foo
     app = lambda{|e|
       $captures << :run
       w = e['warden']
-      w.user.should == "A user"
-      w.user(:foo).should == "A foo user"
-      w.should be_authenticated
-      w.should be_authenticated(:foo)
+      expect(w.user).to eq("A user")
+      expect(w.user(:foo)).to eq("A foo user")
+      expect(w).to be_authenticated
+      expect(w).to be_authenticated(:foo)
     }
     setup_rack(app).call(env_with_params)
-    $captures.should == [:run]
+    expect($captures).to eq([:run])
   end
 
   it "should log out all users" do
     user = "A user"
     foo  = "Foo"
     login_as user
     login_as foo, :scope => :foo
     app = lambda{|e|
       $captures << :run
       w = e['warden']
-      w.user.should == "A user"
-      w.user(:foo).should == "Foo"
+      expect(w.user).to eq("A user")
+      expect(w.user(:foo)).to eq("Foo")
       w.logout
-      w.user.should be_nil
-      w.user(:foo).should be_nil
-      w.should_not be_authenticated
-      w.should_not be_authenticated(:foo)
+      expect(w.user).to be_nil
+      expect(w.user(:foo)).to be_nil
+      expect(w).not_to be_authenticated
+      expect(w).not_to be_authenticated(:foo)
     }
     setup_rack(app).call(env_with_params)
-    $captures.should == [:run]
+    expect($captures).to eq([:run])
   end
 
   it "should logout a specific user" do
     user = "A User"
     foo  = "Foo"
@@ -75,19 +75,19 @@
     login_as foo, :scope => :foo
     app = lambda{|e|
       $captures << :run
       w = e['warden']
       w.logout :foo
-      w.user.should == "A User"
-      w.user(:foo).should be_nil
-      w.should_not be_authenticated(:foo)
+      expect(w.user).to eq("A User")
+      expect(w.user(:foo)).to be_nil
+      expect(w).not_to be_authenticated(:foo)
     }
     setup_rack(app).call(env_with_params)
-    $captures.should == [:run]
+    expect($captures).to eq([:run])
   end
 
   describe "#asset_paths" do
     it "should default asset_paths to anything asset path regex" do
-      Warden.asset_paths.should == [/^\/assets\//]      
+      expect(Warden.asset_paths).to eq([/^\/assets\//]      )
     end
   end
 end