From 75a40ad5bcee37f43fcfe89789dbd8c65be56c21 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 13 Jun 2015 18:19:24 -0400
Subject: [PATCH] Change `foo.should_not` syntax to `expect(foo).not_to` in
specs
---
spec/lib/gitlab/ldap/access_spec.rb | 2 +-
spec/models/project_services/irker_service_spec.rb | 2 +-
spec/services/destroy_group_service_spec.rb | 4 ++--
spec/services/projects/destroy_service_spec.rb | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb
index 2189e313d6a..fc346ea29d0 100644
--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
@@ -56,7 +56,7 @@ describe Gitlab::LDAP::Access do
it "should unblock user in GitLab" do
access.allowed?
- user.should_not be_blocked
+ expect(user).not_to be_blocked
end
end
end
diff --git a/spec/models/project_services/irker_service_spec.rb b/spec/models/project_services/irker_service_spec.rb
index 49face26bb4..96ab95c05c9 100644
--- a/spec/models/project_services/irker_service_spec.rb
+++ b/spec/models/project_services/irker_service_spec.rb
@@ -43,7 +43,7 @@ describe IrkerService do
let(:_recipients) { 'a b c d' }
it 'should add an error if there is too many recipients' do
subject.send :check_recipients_count
- subject.errors.should_not be_blank
+ expect(subject.errors).not_to be_blank
end
end
diff --git a/spec/services/destroy_group_service_spec.rb b/spec/services/destroy_group_service_spec.rb
index 24e439503e7..2a7372b986e 100644
--- a/spec/services/destroy_group_service_spec.rb
+++ b/spec/services/destroy_group_service_spec.rb
@@ -12,8 +12,8 @@ describe DestroyGroupService do
destroy_group(group, user)
end
- it { Group.all.should_not include(group) }
- it { Project.all.should_not include(project) }
+ it { expect(Group.all).not_to include(group) }
+ it { expect(Project.all).not_to include(project) }
end
context 'file system' do
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index cdf576cc0c1..381008def5f 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -12,7 +12,7 @@ describe Projects::DestroyService do
Sidekiq::Testing.inline! { destroy_project(project, user, {}) }
end
- it { Project.all.should_not include(project) }
+ it { expect(Project.all).not_to include(project) }
it { Dir.exists?(path).should be_falsey }
it { Dir.exists?(remove_path).should be_falsey }
end
@@ -23,7 +23,7 @@ describe Projects::DestroyService do
Sidekiq::Testing.fake! { destroy_project(project, user, {}) }
end
- it { Project.all.should_not include(project) }
+ it { expect(Project.all).not_to include(project) }
it { Dir.exists?(path).should be_falsey }
it { Dir.exists?(remove_path).should be_truthy }
end
--
GitLab