From bd9b2731b4ea44168d67a6b38df4e6f0475cd90e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 22 Jun 2022 00:08:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/lib/gitlab/page/admin/subscription.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'qa/lib') diff --git a/qa/lib/gitlab/page/admin/subscription.rb b/qa/lib/gitlab/page/admin/subscription.rb index b90a49abf4b..1538384f6ed 100644 --- a/qa/lib/gitlab/page/admin/subscription.rb +++ b/qa/lib/gitlab/page/admin/subscription.rb @@ -10,6 +10,8 @@ module Gitlab text_field :activation_code button :activate label :terms_of_services, text: /I agree that/ + link :remove_license, 'data-testid': 'license-remove-action' + button :confirm_ok_button p :plan p :started p :name @@ -21,6 +23,9 @@ module Gitlab h2 :users_over_subscription table :subscription_history + span :no_valid_license_alert, text: /no longer has a valid license/ + h3 :no_active_subscription_title, text: /do not have an active subscription/ + def accept_terms terms_of_services_element.click # workaround for hidden checkbox end @@ -39,7 +44,7 @@ module Gitlab # @param license_type [Hash] Type of the license # @option license_type [String] 'license file' # @option license_type [String] 'cloud license' - # @return [Boolean] True if record exsists, false if not + # @return [Boolean] True if record exists, false if not def has_subscription_record?(plan, users_in_license, license_type) # find any records that have a matching plan and seats and type subscription_history_element.hashes.any? do |record| -- cgit v1.2.3