Commit 901f9968 authored by Anastasia McDonald's avatar Anastasia McDonald

Merge branch 'e2e-update-trial-spec' into 'master'

Add state select to trial tests and Unquarantine Fulfillment tests

See merge request gitlab-org/gitlab!79678
parents 96e4ba61 cecaec80
...@@ -12,6 +12,7 @@ module QA ...@@ -12,6 +12,7 @@ module QA
select :number_of_employees select :number_of_employees
text_field :telephone_number text_field :telephone_number
select :country select :country
select :state, id: 'state'
button :continue button :continue
end end
end end
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging }, quarantine: { RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging } do
only: { subdomain: %i[staging] },
issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/350856",
type: :broken
} do
describe 'Purchase' do describe 'Purchase' do
let(:api_client) { Runtime::API::Client.as_admin } let(:api_client) { Runtime::API::Client.as_admin }
let(:user) do let(:user) do
...@@ -102,7 +98,8 @@ module QA ...@@ -102,7 +98,8 @@ module QA
company_name: 'QA Test Company', company_name: 'QA Test Company',
number_of_employees: '500 - 1,999', number_of_employees: '500 - 1,999',
telephone_number: '555-555-5555', telephone_number: '555-555-5555',
country: 'United States of America' country: 'United States of America',
state: 'CA'
} }
end end
...@@ -111,8 +108,9 @@ module QA ...@@ -111,8 +108,9 @@ module QA
# setter # setter
new.company_name = customer_trial_info[:company_name] new.company_name = customer_trial_info[:company_name]
new.number_of_employees = customer_trial_info[:number_of_employees] new.number_of_employees = customer_trial_info[:number_of_employees]
new.telephone_number = customer_trial_info[:telephone_number]
new.country = customer_trial_info[:country] new.country = customer_trial_info[:country]
new.telephone_number = customer_trial_info[:telephone_number]
new.state = customer_trial_info[:state]
new.continue new.continue
end end
......
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
module QA module QA
include QA::Support::Helpers::Plan include QA::Support::Helpers::Plan
RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging }, quarantine: { RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging } do
only: { subdomain: %i[staging] },
issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/350856",
type: :broken
} do
context 'Purchase CI minutes' do context 'Purchase CI minutes' do
# the quantity of products to purchase # the quantity of products to purchase
let(:purchase_quantity) { 5 } let(:purchase_quantity) { 5 }
......
...@@ -17,11 +17,7 @@ module QA ...@@ -17,11 +17,7 @@ module QA
end end
end end
RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging }, quarantine: { RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging } do
only: { subdomain: %i[staging] },
issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/350856",
type: :broken
} do
let(:hash) { SecureRandom.hex(4) } let(:hash) { SecureRandom.hex(4) }
let(:user) do let(:user) do
Resource::User.fabricate_via_api! do |user| Resource::User.fabricate_via_api! do |user|
......
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
module QA module QA
include QA::Support::Helpers::Plan include QA::Support::Helpers::Plan
RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging }, quarantine: { RSpec.describe 'Fulfillment', :requires_admin, only: { subdomain: :staging } do
only: { subdomain: %i[staging] },
issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/350856",
type: :broken
} do
describe 'Purchase' do describe 'Purchase' do
describe 'group plan' do describe 'group plan' do
let(:hash) { SecureRandom.hex(4) } let(:hash) { SecureRandom.hex(4) }
......
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