Merge pull request #8785 from jvanbaarsen/rspec-upgrade

Rspec upgrade

1 files changed, 15 insertions, 15 deletions

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 1d4ba8a2b85..9428224a64f 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -19,29 +19,29 @@ describe Group do
   let!(:group) { create(:group) }
 
   describe "Associations" do
-    it { should have_many :projects }
-    it { should have_many :group_members }
+    it { is_expected.to have_many :projects }
+    it { is_expected.to have_many :group_members }
   end
 
-  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_not validate_presence_of :owner }
+  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.not_to validate_presence_of :owner }
 
   describe :users do
-    it { group.users.should == group.owners }
+    it { expect(group.users).to eq(group.owners) }
   end
 
   describe :human_name do
-    it { group.human_name.should == group.name }
+    it { expect(group.human_name).to eq(group.name) }
   end
 
   describe :add_users do
     let(:user) { create(:user) }
     before { group.add_user(user, GroupMember::MASTER) }
 
-    it { group.group_members.masters.map(&:user).should include(user) }
+    it { expect(group.group_members.masters.map(&:user)).to include(user) }
   end
 
   describe :add_users do
@@ -49,10 +49,10 @@ describe Group do
     before { group.add_users([user.id], GroupMember::GUEST) }
 
     it "should update the group permission" do
-      group.group_members.guests.map(&:user).should include(user)
+      expect(group.group_members.guests.map(&:user)).to include(user)
       group.add_users([user.id], GroupMember::DEVELOPER)
-      group.group_members.developers.map(&:user).should include(user)
-      group.group_members.guests.map(&:user).should_not include(user)
+      expect(group.group_members.developers.map(&:user)).to include(user)
+      expect(group.group_members.guests.map(&:user)).not_to include(user)
     end
   end
 
@@ -62,12 +62,12 @@ describe Group do
 
     it "should be true if avatar is image" do
       group.update_attribute(:avatar, 'uploads/avatar.png')
-      group.avatar_type.should be_true
+      expect(group.avatar_type).to be_truthy
     end
 
     it "should be false if avatar is html page" do
       group.update_attribute(:avatar, 'uploads/avatar.html')
-      group.avatar_type.should == ["only images allowed"]
+      expect(group.avatar_type).to eq(["only images allowed"])
     end
   end
 end