Commit 727818b1 authored by Mike Greiling's avatar Mike Greiling

update runner limits spec to use group membership

parent 5b97b793
FactoryGirl.define do FactoryGirl.define do
factory :group do factory :group, class: Group, parent: :namespace do
sequence(:name) { |n| "group#{n}" } sequence(:name) { |n| "group#{n}" }
path { name.downcase.gsub(/\s/, '_') } path { name.downcase.gsub(/\s/, '_') }
type 'Group' type 'Group'
......
...@@ -2,8 +2,8 @@ require 'spec_helper' ...@@ -2,8 +2,8 @@ require 'spec_helper'
feature 'CI shared runner limits', feature: true do feature 'CI shared runner limits', feature: true do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project, :public, namespace: namespace, shared_runners_enabled: true) } let!(:project) { create(:project, :public, namespace: group, shared_runners_enabled: true) }
let(:namespace) { create(:namespace) } let(:group) { create(:group) }
before do before do
login_as(user) login_as(user)
...@@ -11,7 +11,7 @@ feature 'CI shared runner limits', feature: true do ...@@ -11,7 +11,7 @@ feature 'CI shared runner limits', feature: true do
context 'when project member' do context 'when project member' do
before do before do
project.team << [user, :developer] group.add_developer(user)
end end
context 'without limit' do context 'without limit' do
...@@ -23,16 +23,16 @@ feature 'CI shared runner limits', feature: true do ...@@ -23,16 +23,16 @@ feature 'CI shared runner limits', feature: true do
context 'when limit is defined' do context 'when limit is defined' do
context 'when limit is exceeded' do context 'when limit is exceeded' do
let(:namespace) { create(:namespace, :with_used_build_minutes_limit) } let(:group) { create(:group, :with_used_build_minutes_limit) }
scenario 'it displays a warning message on project homepage' do scenario 'it displays a warning message on project homepage' do
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
expect_quota_exceeded_alert("#{namespace.name} has exceeded their build minutes quota.") expect_quota_exceeded_alert("#{group.name} has exceeded their build minutes quota.")
end end
end end
context 'when limit not yet exceeded' do context 'when limit not yet exceeded' do
let(:namespace) { create(:namespace, :with_not_used_build_minutes_limit) } let(:group) { create(:group, :with_not_used_build_minutes_limit) }
scenario 'it does not display a warning message on project homepage' do scenario 'it does not display a warning message on project homepage' do
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
...@@ -41,7 +41,7 @@ feature 'CI shared runner limits', feature: true do ...@@ -41,7 +41,7 @@ feature 'CI shared runner limits', feature: true do
end end
context 'when minutes are not yet set' do context 'when minutes are not yet set' do
let(:namespace) { create(:namespace, :with_build_minutes_limit) } let(:group) { create(:group, :with_build_minutes_limit) }
scenario 'it does not display a warning message on project homepage' do scenario 'it does not display a warning message on project homepage' do
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
...@@ -52,7 +52,7 @@ feature 'CI shared runner limits', feature: true do ...@@ -52,7 +52,7 @@ feature 'CI shared runner limits', feature: true do
end end
context 'when not a project member' do context 'when not a project member' do
let(:namespace) { create(:namespace, :with_used_build_minutes_limit) } let(:group) { create(:group, :with_used_build_minutes_limit) }
context 'when limit is defined and limit is exceeded' do context 'when limit is defined and limit is exceeded' do
scenario 'it does not display a warning message on project homepage' do scenario 'it does not display a warning message on project homepage' do
......
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