Commit 7fae3778 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'e2e-update-ci-tests' into 'master'

Fix CI minutes tests with new ChemLab updates

See merge request gitlab-org/gitlab!71818
parents 74403b1c e2da78d4
...@@ -20,11 +20,6 @@ module Gitlab ...@@ -20,11 +20,6 @@ module Gitlab
def additional_limits def additional_limits
additional_minutes_usage[%r{([^/ ]+)$}] additional_minutes_usage[%r{([^/ ]+)$}]
end end
# TODO: Refactor/Remove this method once https://gitlab.com/gitlab-org/quality/chemlab/-/merge_requests/28 is merged
def additional_minutes_exist?
has_element?(:strong, :additional_minutes, text: 'Additional minutes')
end
end end
end end
end end
......
...@@ -75,8 +75,8 @@ module QA ...@@ -75,8 +75,8 @@ module QA
Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quota| Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quota|
expected_minutes = ci_product[:minutes] * purchase_quantity expected_minutes = ci_product[:minutes] * purchase_quantity
expect(usage_quota.purchase_successful_alert?).to be true expect { usage_quota.purchase_successful_alert? }.to eventually_be_truthy.within(max_duration: 120, max_attempts: 60)
expect { usage_quota.additional_minutes_exist? }.to eventually_be_truthy.within(max_duration: 120, max_attempts: 60, reload_page: page) expect { usage_quota.additional_minutes? }.to eventually_be_truthy.within(max_duration: 120, max_attempts: 60, reload_page: page)
expect(usage_quota.additional_limits).to eq(expected_minutes.to_s) expect(usage_quota.additional_limits).to eq(expected_minutes.to_s)
end end
end end
......
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