Commit d3f8526c authored by Tim Zallmann's avatar Tim Zallmann

Fixed Trainging Whitespace

parent 1f32e7a6
...@@ -71,7 +71,7 @@ module LicenseHelper ...@@ -71,7 +71,7 @@ module LicenseHelper
if @project.group if @project.group
group_billings_path(@project.group) group_billings_path(@project.group)
else else
profile_billings_path profile_billings_path
end end
end end
......
...@@ -8,7 +8,7 @@ describe 'Promotions', js: true do ...@@ -8,7 +8,7 @@ describe 'Promotions', js: true do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:milestone) { create(:milestone, project: project, start_date: Date.today, due_date: 7.days.from_now) } let(:milestone) { create(:milestone, project: project, start_date: Date.today, due_date: 7.days.from_now) }
let!(:issue) { create(:issue, project: project, author: user) } let!(:issue) { create(:issue, project: project, author: user) }
let(:otherproject) { create(:project, :repository, namespace: otherdeveloper.namespace) } let(:otherproject) { create(:project, :repository, namespace: otherdeveloper.namespace) }
describe 'if you have a license' do describe 'if you have a license' do
before do before do
...@@ -35,7 +35,7 @@ describe 'Promotions', js: true do ...@@ -35,7 +35,7 @@ describe 'Promotions', js: true do
visit edit_project_path(project) visit edit_project_path(project)
expect(find('#promote_service_desk')).to have_content 'Contact your Administrator to upgrade your license.' expect(find('#promote_service_desk')).to have_content 'Contact your Administrator to upgrade your license.'
end end
it 'should have the start trial button' do it 'should have the start trial button' do
sign_in(admin) sign_in(admin)
visit edit_project_path(project) visit edit_project_path(project)
...@@ -49,14 +49,14 @@ describe 'Promotions', js: true do ...@@ -49,14 +49,14 @@ describe 'Promotions', js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
otherproject.team << [user, :master] otherproject.team << [user, :master]
stub_application_setting(check_namespace_plan: true) stub_application_setting(check_namespace_plan: true)
allow(Gitlab).to receive(:com?) { true } allow(Gitlab).to receive(:com?) { true }
sign_in(user) sign_in(user)
end end
it 'should have the Upgrade your plan button' do it 'should have the Upgrade your plan button' do
visit edit_project_path(project) visit edit_project_path(project)
expect(find('#promote_service_desk')).to have_content 'Upgrade your plan' expect(find('#promote_service_desk')).to have_content 'Upgrade your plan'
end end
...@@ -70,7 +70,7 @@ describe 'Promotions', js: true do ...@@ -70,7 +70,7 @@ describe 'Promotions', js: true do
describe 'for service desk', js: true do describe 'for service desk', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -97,7 +97,7 @@ describe 'Promotions', js: true do ...@@ -97,7 +97,7 @@ describe 'Promotions', js: true do
describe 'for merge request improve', js: true do describe 'for merge request improve', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -124,7 +124,7 @@ describe 'Promotions', js: true do ...@@ -124,7 +124,7 @@ describe 'Promotions', js: true do
describe 'for repository features', js: true do describe 'for repository features', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -132,7 +132,7 @@ describe 'Promotions', js: true do ...@@ -132,7 +132,7 @@ describe 'Promotions', js: true do
it 'should appear in repository settings page' do it 'should appear in repository settings page' do
visit project_settings_repository_path(project) visit project_settings_repository_path(project)
expect(find('#promote_repository_features')).to have_content 'Improve repositories with GitLab Enterprise Edition' expect(find('#promote_repository_features')).to have_content 'Improve repositories with GitLab Enterprise Edition'
expect(find('#promote_repository_features')).to have_content 'Push Rules are defined per project so you can have different rules applied to different projects depends on your needs.' expect(find('#promote_repository_features')).to have_content 'Push Rules are defined per project so you can have different rules applied to different projects depends on your needs.'
end end
...@@ -152,7 +152,7 @@ describe 'Promotions', js: true do ...@@ -152,7 +152,7 @@ describe 'Promotions', js: true do
describe 'for squash commits', js: true do describe 'for squash commits', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -179,7 +179,7 @@ describe 'Promotions', js: true do ...@@ -179,7 +179,7 @@ describe 'Promotions', js: true do
describe 'for burndown charts', js: true do describe 'for burndown charts', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -206,7 +206,7 @@ describe 'Promotions', js: true do ...@@ -206,7 +206,7 @@ describe 'Promotions', js: true do
describe 'for issue export', js: true do describe 'for issue export', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -222,7 +222,7 @@ describe 'Promotions', js: true do ...@@ -222,7 +222,7 @@ describe 'Promotions', js: true do
describe 'for project audit events', js: true do describe 'for project audit events', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
project.team << [user, :master] project.team << [user, :master]
sign_in(user) sign_in(user)
...@@ -237,7 +237,7 @@ describe 'Promotions', js: true do ...@@ -237,7 +237,7 @@ describe 'Promotions', js: true do
describe 'for group contribution analytics', js: true do describe 'for group contribution analytics', js: true do
let!(:license) { nil } let!(:license) { nil }
before do before do
group.add_owner(user) group.add_owner(user)
sign_in(user) sign_in(user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment