diff options
author | Rémy Coutable <remy@rymai.me> | 2017-06-29 18:03:17 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-30 17:52:27 +0200 |
commit | 1b0c6ffd512d0bee24964936da02e1b10d6a5a67 (patch) | |
tree | e60bf4570de0b5088aa3e603aab6d7ecd0516476 /spec | |
parent | d52034b2054bbefebeaf4771a87b57dfe4fc7c86 (diff) | |
download | gitlab-ce-1b0c6ffd512d0bee24964936da02e1b10d6a5a67.tar.gz |
Disable RSpec/BeforeAfterAll and enable RSpec/ImplicitExpect copsenable-a-few-rubocop-rspec-cops
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/project_group_link_spec.rb | 12 | ||||
-rw-r--r-- | spec/models/project_services/external_wiki_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/spec/models/project_group_link_spec.rb b/spec/models/project_group_link_spec.rb index 4161b9158b1..d68d8b719cd 100644 --- a/spec/models/project_group_link_spec.rb +++ b/spec/models/project_group_link_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe ProjectGroupLink do describe "Associations" do - it { should belong_to(:group) } - it { should belong_to(:project) } + it { is_expected.to belong_to(:group) } + it { is_expected.to belong_to(:project) } end describe "Validation" do @@ -12,10 +12,10 @@ describe ProjectGroupLink do let(:project) { create(:project, group: group) } let!(:project_group_link) { create(:project_group_link, project: project) } - it { should validate_presence_of(:project_id) } - it { should validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) } - it { should validate_presence_of(:group) } - it { should validate_presence_of(:group_access) } + it { is_expected.to validate_presence_of(:project_id) } + it { is_expected.to validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) } + it { is_expected.to validate_presence_of(:group) } + it { is_expected.to validate_presence_of(:group_access) } it "doesn't allow a project to be shared with the group it is in" do project_group_link.group = group diff --git a/spec/models/project_services/external_wiki_service_spec.rb b/spec/models/project_services/external_wiki_service_spec.rb index 291fc645a1c..ef10df9e092 100644 --- a/spec/models/project_services/external_wiki_service_spec.rb +++ b/spec/models/project_services/external_wiki_service_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe ExternalWikiService, models: true do include ExternalWikiHelper describe "Associations" do - it { should belong_to :project } - it { should have_one :service_hook } + it { is_expected.to belong_to :project } + it { is_expected.to have_one :service_hook } end describe 'Validations' do diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 1390848ff4a..f9b702c54aa 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -823,13 +823,13 @@ describe Project, models: true do let(:avatar_path) { "/#{project.full_path}/avatar" } - it { should eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" } + it { is_expected.to eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" } end context 'when git repo is empty' do let(:project) { create(:empty_project) } - it { should eq nil } + it { is_expected.to eq nil } end end |