summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-06-06 14:55:18 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-06-07 22:34:09 +0800
commit4fcdcc36f168bc3791536c20a6168eb7428f623d (patch)
treecafab170f10374f00df268088af1bf3b74ad7992
parent5f3e647330041cdf588c2def9cba517dd546d365 (diff)
downloadgitlab-ce-4fcdcc36f168bc3791536c20a6168eb7428f623d.tar.gz
Avoid using subject and is_expected.to:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12274602
-rw-r--r--spec/models/user_spec.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 84c93dfeb24..f727611f7ce 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -856,7 +856,6 @@ describe User, models: true do
describe '#ci_authorized_runners' do
let(:user) { create(:user) }
let(:runner) { create(:ci_runner) }
- subject { user.ci_authorized_runners }
before do
project.runners << runner
@@ -866,7 +865,7 @@ describe User, models: true do
let(:project) { create(:project) }
it 'does not load' do
- is_expected.to be_empty
+ expect(user.ci_authorized_runners).to be_empty
end
end
@@ -875,7 +874,7 @@ describe User, models: true do
let(:project) { create(:project, namespace: namespace) }
it 'loads' do
- is_expected.to contain_exactly(runner)
+ expect(user.ci_authorized_runners).to contain_exactly(runner)
end
end
@@ -885,7 +884,9 @@ describe User, models: true do
add_user(Gitlab::Access::MASTER)
end
- it { is_expected.to contain_exactly(runner) }
+ it 'loads' do
+ expect(user.ci_authorized_runners).to contain_exactly(runner)
+ end
end
context 'when the user is a developer' do
@@ -893,7 +894,9 @@ describe User, models: true do
add_user(Gitlab::Access::DEVELOPER)
end
- it { is_expected.to be_empty }
+ it 'does not load' do
+ expect(user.ci_authorized_runners).to be_empty
+ end
end
end