summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/user_access_spec.rb
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-07-12 10:47:36 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-07-13 14:18:05 +0530
commitbb81f2afc1d82d6e88d7039025c8a8be0794aac6 (patch)
treee016e94d8e0d709ca4d614a0ecae81b4bfe48700 /spec/lib/gitlab/user_access_spec.rb
parentea9e8f4609f46f9c5713a8346f91dc19d310c2e1 (diff)
downloadgitlab-ce-bb81f2afc1d82d6e88d7039025c8a8be0794aac6.tar.gz
Implement last round of review comments from !4892.18193-developers-can-merge
1. Fix typos, minor styling errors. 2. Use single quotes rather than double quotes in `user_access_spec`. 3. Test formatting.
Diffstat (limited to 'spec/lib/gitlab/user_access_spec.rb')
-rw-r--r--spec/lib/gitlab/user_access_spec.rb40
1 files changed, 19 insertions, 21 deletions
diff --git a/spec/lib/gitlab/user_access_spec.rb b/spec/lib/gitlab/user_access_spec.rb
index c77b746cc88..aa9ec243498 100644
--- a/spec/lib/gitlab/user_access_spec.rb
+++ b/spec/lib/gitlab/user_access_spec.rb
@@ -7,40 +7,38 @@ describe Gitlab::UserAccess, lib: true do
describe 'can_push_to_branch?' do
describe 'push to none protected branch' do
- it "returns true if user is a master" do
+ it 'returns true if user is a master' do
project.team << [user, :master]
- expect(access.can_push_to_branch?("random_branch")).to be_truthy
+ expect(access.can_push_to_branch?('random_branch')).to be_truthy
end
- it "returns true if user is a developer" do
+ it 'returns true if user is a developer' do
project.team << [user, :developer]
- expect(access.can_push_to_branch?("random_branch")).to be_truthy
+ expect(access.can_push_to_branch?('random_branch')).to be_truthy
end
- it "returns false if user is a reporter" do
+ it 'returns false if user is a reporter' do
project.team << [user, :reporter]
- expect(access.can_push_to_branch?("random_branch")).to be_falsey
+ expect(access.can_push_to_branch?('random_branch')).to be_falsey
end
end
describe 'push to protected branch' do
- before do
- @branch = create :protected_branch, project: project
- end
+ let(:branch) { create :protected_branch, project: project }
- it "returns true if user is a master" do
+ it 'returns true if user is a master' do
project.team << [user, :master]
- expect(access.can_push_to_branch?(@branch.name)).to be_truthy
+ expect(access.can_push_to_branch?(branch.name)).to be_truthy
end
- it "returns false if user is a developer" do
+ it 'returns false if user is a developer' do
project.team << [user, :developer]
- expect(access.can_push_to_branch?(@branch.name)).to be_falsey
+ expect(access.can_push_to_branch?(branch.name)).to be_falsey
end
- it "returns false if user is a reporter" do
+ it 'returns false if user is a reporter' do
project.team << [user, :reporter]
- expect(access.can_push_to_branch?(@branch.name)).to be_falsey
+ expect(access.can_push_to_branch?(branch.name)).to be_falsey
end
end
@@ -49,17 +47,17 @@ describe Gitlab::UserAccess, lib: true do
@branch = create :protected_branch, project: project, developers_can_push: true
end
- it "returns true if user is a master" do
+ it 'returns true if user is a master' do
project.team << [user, :master]
expect(access.can_push_to_branch?(@branch.name)).to be_truthy
end
- it "returns true if user is a developer" do
+ it 'returns true if user is a developer' do
project.team << [user, :developer]
expect(access.can_push_to_branch?(@branch.name)).to be_truthy
end
- it "returns false if user is a reporter" do
+ it 'returns false if user is a reporter' do
project.team << [user, :reporter]
expect(access.can_push_to_branch?(@branch.name)).to be_falsey
end
@@ -70,17 +68,17 @@ describe Gitlab::UserAccess, lib: true do
@branch = create :protected_branch, project: project, developers_can_merge: true
end
- it "returns true if user is a master" do
+ it 'returns true if user is a master' do
project.team << [user, :master]
expect(access.can_merge_to_branch?(@branch.name)).to be_truthy
end
- it "returns true if user is a developer" do
+ it 'returns true if user is a developer' do
project.team << [user, :developer]
expect(access.can_merge_to_branch?(@branch.name)).to be_truthy
end
- it "returns false if user is a reporter" do
+ it 'returns false if user is a reporter' do
project.team << [user, :reporter]
expect(access.can_merge_to_branch?(@branch.name)).to be_falsey
end