Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm

Conflicts:
	lib/api/users.rb

1 files changed, 15 insertions, 15 deletions

diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 3562ebed1ff..4e268f8d8fa 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -18,29 +18,29 @@ require 'spec_helper'
 describe Namespace do
   let!(:namespace) { create(:namespace) }
 
-  it { should have_many :projects }
-  it { should validate_presence_of :name }
-  it { should validate_uniqueness_of(:name) }
-  it { should validate_presence_of :path }
-  it { should validate_uniqueness_of(:path) }
-  it { should validate_presence_of :owner }
+  it { is_expected.to have_many :projects }
+  it { is_expected.to validate_presence_of :name }
+  it { is_expected.to validate_uniqueness_of(:name) }
+  it { is_expected.to validate_presence_of :path }
+  it { is_expected.to validate_uniqueness_of(:path) }
+  it { is_expected.to validate_presence_of :owner }
 
   describe "Mass assignment" do
   end
 
   describe "Respond to" do
-    it { should respond_to(:human_name) }
-    it { should respond_to(:to_param) }
+    it { is_expected.to respond_to(:human_name) }
+    it { is_expected.to respond_to(:to_param) }
   end
 
-  it { Namespace.global_id.should == 'GLN' }
+  it { expect(Namespace.global_id).to eq('GLN') }
 
   describe :to_param do
-    it { namespace.to_param.should == namespace.path }
+    it { expect(namespace.to_param).to eq(namespace.path) }
   end
 
   describe :human_name do
-    it { namespace.human_name.should == namespace.owner_name }
+    it { expect(namespace.human_name).to eq(namespace.owner_name) }
   end
 
   describe :search do
@@ -48,8 +48,8 @@ describe Namespace do
       @namespace = create :namespace
     end
 
-    it { Namespace.search(@namespace.path).should == [@namespace] }
-    it { Namespace.search('unknown').should == [] }
+    it { expect(Namespace.search(@namespace.path)).to eq([@namespace]) }
+    it { expect(Namespace.search('unknown')).to eq([]) }
   end
 
   describe :move_dir do
@@ -66,13 +66,13 @@ describe Namespace do
       new_path = @namespace.path + "_new"
       @namespace.stub(path_was: @namespace.path)
       @namespace.stub(path: new_path)
-      @namespace.move_dir.should be_true
+      expect(@namespace.move_dir).to be_truthy
     end
   end
 
   describe :rm_dir do
     it "should remove dir" do
-      namespace.rm_dir.should be_true
+      expect(namespace.rm_dir).to be_truthy
     end
   end
 end