Add latest changes from gitlab-org/gitlab@master

2 files changed, 84 insertions, 2 deletions

diff --git a/qa/lib/gitlab/page/subscriptions/new.rb b/qa/lib/gitlab/page/subscriptions/new.rb
index 6e3cb45fd29..95e5028f985 100644
--- a/qa/lib/gitlab/page/subscriptions/new.rb
+++ b/qa/lib/gitlab/page/subscriptions/new.rb
@@ -38,8 +38,8 @@ module Gitlab
         button :confirm_purchase, text: /Confirm purchase/
 
         # Order Summary
-        div :selected_plan, 'data-testid': 'selected-plan'
-        div :order_total, 'data-testid': 'total-amount'
+        div :selected_plan
+        div :total_amount
       end
     end
   end
diff --git a/qa/lib/gitlab/page/subscriptions/new.stub.rb b/qa/lib/gitlab/page/subscriptions/new.stub.rb
index 93680ab95e0..a7f5d689838 100644
--- a/qa/lib/gitlab/page/subscriptions/new.stub.rb
+++ b/qa/lib/gitlab/page/subscriptions/new.stub.rb
@@ -86,6 +86,40 @@ module Gitlab
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
+        # @note Defined as +text_field :quantity+
+        # @return [String] The text content or value of +quantity+
+        def quantity
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # Set the value of quantity
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     new.quantity = 'value'
+        #   end
+        # @param value [String] The value to set.
+        def quantity=(value)
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     expect(new.quantity_element).to exist
+        #   end
+        # @return [Watir::TextField] The raw +TextField+ element
+        def quantity_element
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     expect(new).to be_quantity
+        #   end
+        # @return [Boolean] true if the +quantity+ element is present on the page
+        def quantity?
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
         # @note Defined as +button :continue_to_billing+
         # Clicks +continue_to_billing+
         def continue_to_billing
@@ -539,6 +573,54 @@ module Gitlab
         def confirm_purchase?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
+
+        # @note Defined as +div :selected_plan+
+        # @return [String] The text content or value of +selected_plan+
+        def selected_plan
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     expect(new.selected_plan_element).to exist
+        #   end
+        # @return [Watir::Div] The raw +Div+ element
+        def selected_plan_element
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     expect(new).to be_selected_plan
+        #   end
+        # @return [Boolean] true if the +selected_plan+ element is present on the page
+        def selected_plan?
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @note Defined as +div :total_amount+
+        # @return [String] The text content or value of +total_amount+
+        def total_amount
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     expect(new.total_amount_element).to exist
+        #   end
+        # @return [Watir::Div] The raw +Div+ element
+        def total_amount_element
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Subscriptions::New.perform do |new|
+        #     expect(new).to be_total_amount
+        #   end
+        # @return [Boolean] true if the +total_amount+ element is present on the page
+        def total_amount?
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
       end
     end
   end