Add latest changes from gitlab-org/gitlab@master

4 files changed, 97 insertions, 126 deletions

diff --git a/qa/lib/gitlab/page/admin/dashboard.rb b/qa/lib/gitlab/page/admin/dashboard.rb
index f1a732f8fac..b6ae49a0e3b 100644
--- a/qa/lib/gitlab/page/admin/dashboard.rb
+++ b/qa/lib/gitlab/page/admin/dashboard.rb
@@ -8,7 +8,6 @@ module Gitlab
 
         h2 :users_in_license
         h2 :billable_users
-        h3 :number_of_users
       end
     end
   end
diff --git a/qa/lib/gitlab/page/admin/dashboard.stub.rb b/qa/lib/gitlab/page/admin/dashboard.stub.rb
index 820acf79b9b..da717558133 100644
--- a/qa/lib/gitlab/page/admin/dashboard.stub.rb
+++ b/qa/lib/gitlab/page/admin/dashboard.stub.rb
@@ -51,30 +51,6 @@ module Gitlab
         def billable_users?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
-
-        # @note Defined as +h3 :number_of_users+
-        # @return [String] The text content or value of +number_of_users+
-        def number_of_users
-          # This is a stub, used for indexing. The method is dynamically generated.
-        end
-
-        # @example
-        #   Gitlab::Page::Admin::Dashboard.perform do |dashboard|
-        #     expect(dashboard.number_of_users_element).to exist
-        #   end
-        # @return [Watir::H3] The raw +H3+ element
-        def number_of_users_element
-          # This is a stub, used for indexing. The method is dynamically generated.
-        end
-
-        # @example
-        #   Gitlab::Page::Admin::Dashboard.perform do |dashboard|
-        #     expect(dashboard).to be_number_of_users
-        #   end
-        # @return [Boolean] true if the +number_of_users+ element is present on the page
-        def number_of_users?
-          # This is a stub, used for indexing. The method is dynamically generated.
-        end
       end
     end
   end
diff --git a/qa/lib/gitlab/page/admin/subscription.rb b/qa/lib/gitlab/page/admin/subscription.rb
index 058cf8d281e..e19f0580007 100644
--- a/qa/lib/gitlab/page/admin/subscription.rb
+++ b/qa/lib/gitlab/page/admin/subscription.rb
@@ -12,15 +12,11 @@ module Gitlab
         label :terms_of_services, text: /I agree that/
         button :remove_license
         button :confirm_remove_license
-        p :plan
-        p :started
-        p :name
-        p :company
-        p :email
-        h2 :billable_users
-        h2 :maximum_users
+        td :plan
+        td :name
+        td :company
+        td :email
         h2 :users_in_subscription
-        h2 :users_over_subscription
         table :subscription_history
 
         div :no_valid_license_alert, text: /no longer has a valid license/
diff --git a/qa/lib/gitlab/page/admin/subscription.stub.rb b/qa/lib/gitlab/page/admin/subscription.stub.rb
index 56a063e8978..9ed127f9281 100644
--- a/qa/lib/gitlab/page/admin/subscription.stub.rb
+++ b/qa/lib/gitlab/page/admin/subscription.stub.rb
@@ -4,7 +4,7 @@ module Gitlab
   module Page
     module Admin
       module Subscription
-        # @note Defined as +h6 :subscription_details+
+        # @note Defined as +div :subscription_details+
         # @return [String] The text content or value of +subscription_details+
         def subscription_details
           # This is a stub, used for indexing. The method is dynamically generated.
@@ -14,7 +14,7 @@ module Gitlab
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
         #     expect(subscription.subscription_details_element).to exist
         #   end
-        # @return [Watir::H6] The raw +H6+ element
+        # @return [Watir::Div] The raw +Div+ element
         def subscription_details_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
@@ -62,6 +62,30 @@ module Gitlab
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
+        # @note Defined as +button :activate+
+        # Clicks +activate+
+        def activate
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Admin::Subscription.perform do |subscription|
+        #     expect(subscription.activate_element).to exist
+        #   end
+        # @return [Watir::Button] The raw +Button+ element
+        def activate_element
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
+        # @example
+        #   Gitlab::Page::Admin::Subscription.perform do |subscription|
+        #     expect(subscription).to be_activate
+        #   end
+        # @return [Boolean] true if the +activate+ element is present on the page
+        def activate?
+          # This is a stub, used for indexing. The method is dynamically generated.
+        end
+
         # @note Defined as +label :terms_of_services+
         # @return [String] The text content or value of +terms_of_services+
         def terms_of_services
@@ -86,79 +110,79 @@ module Gitlab
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +button :activate+
-        # Clicks +activate+
-        def activate
+        # @note Defined as +button :remove_license+
+        # Clicks +remove_license+
+        def remove_license
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.activate_element).to exist
+        #     expect(subscription.remove_license_element).to exist
         #   end
         # @return [Watir::Button] The raw +Button+ element
-        def activate_element
+        def remove_license_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_activate
+        #     expect(subscription).to be_remove_license
         #   end
-        # @return [Boolean] true if the +activate+ element is present on the page
-        def activate?
+        # @return [Boolean] true if the +remove_license+ element is present on the page
+        def remove_license?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +p :plan+
-        # @return [String] The text content or value of +plan+
-        def plan
+        # @note Defined as +button :confirm_remove_license+
+        # Clicks +confirm_remove_license+
+        def confirm_remove_license
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.plan_element).to exist
+        #     expect(subscription.confirm_remove_license_element).to exist
         #   end
-        # @return [Watir::P] The raw +P+ element
-        def plan_element
+        # @return [Watir::Button] The raw +Button+ element
+        def confirm_remove_license_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_plan
+        #     expect(subscription).to be_confirm_remove_license
         #   end
-        # @return [Boolean] true if the +plan+ element is present on the page
-        def plan?
+        # @return [Boolean] true if the +confirm_remove_license+ element is present on the page
+        def confirm_remove_license?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +p :started+
-        # @return [String] The text content or value of +started+
-        def started
+        # @note Defined as +td :plan+
+        # @return [String] The text content or value of +plan+
+        def plan
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.started_element).to exist
+        #     expect(subscription.plan_element).to exist
         #   end
-        # @return [Watir::P] The raw +P+ element
-        def started_element
+        # @return [Watir::Td] The raw +Td+ element
+        def plan_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_started
+        #     expect(subscription).to be_plan
         #   end
-        # @return [Boolean] true if the +started+ element is present on the page
-        def started?
+        # @return [Boolean] true if the +plan+ element is present on the page
+        def plan?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +p :name+
+        # @note Defined as +td :name+
         # @return [String] The text content or value of +name+
         def name
           # This is a stub, used for indexing. The method is dynamically generated.
@@ -168,7 +192,7 @@ module Gitlab
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
         #     expect(subscription.name_element).to exist
         #   end
-        # @return [Watir::P] The raw +P+ element
+        # @return [Watir::Td] The raw +Td+ element
         def name_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
@@ -182,7 +206,7 @@ module Gitlab
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +p :company+
+        # @note Defined as +td :company+
         # @return [String] The text content or value of +company+
         def company
           # This is a stub, used for indexing. The method is dynamically generated.
@@ -192,7 +216,7 @@ module Gitlab
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
         #     expect(subscription.company_element).to exist
         #   end
-        # @return [Watir::P] The raw +P+ element
+        # @return [Watir::Td] The raw +Td+ element
         def company_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
@@ -206,7 +230,7 @@ module Gitlab
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +p :email+
+        # @note Defined as +td :email+
         # @return [String] The text content or value of +email+
         def email
           # This is a stub, used for indexing. The method is dynamically generated.
@@ -216,7 +240,7 @@ module Gitlab
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
         #     expect(subscription.email_element).to exist
         #   end
-        # @return [Watir::P] The raw +P+ element
+        # @return [Watir::Td] The raw +Td+ element
         def email_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
@@ -230,123 +254,99 @@ module Gitlab
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +h2 :billable_users+
-        # @return [String] The text content or value of +billable_users+
-        def billable_users
-          # This is a stub, used for indexing. The method is dynamically generated.
-        end
-
-        # @example
-        #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.billable_users_element).to exist
-        #   end
-        # @return [Watir::H2] The raw +H2+ element
-        def billable_users_element
-          # This is a stub, used for indexing. The method is dynamically generated.
-        end
-
-        # @example
-        #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_billable_users
-        #   end
-        # @return [Boolean] true if the +billable_users+ element is present on the page
-        def billable_users?
-          # This is a stub, used for indexing. The method is dynamically generated.
-        end
-
-        # @note Defined as +h2 :maximum_users+
-        # @return [String] The text content or value of +maximum_users+
-        def maximum_users
+        # @note Defined as +h2 :users_in_subscription+
+        # @return [String] The text content or value of +users_in_subscription+
+        def users_in_subscription
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.maximum_users_element).to exist
+        #     expect(subscription.users_in_subscription_element).to exist
         #   end
         # @return [Watir::H2] The raw +H2+ element
-        def maximum_users_element
+        def users_in_subscription_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_maximum_users
+        #     expect(subscription).to be_users_in_subscription
         #   end
-        # @return [Boolean] true if the +maximum_users+ element is present on the page
-        def maximum_users?
+        # @return [Boolean] true if the +users_in_subscription+ element is present on the page
+        def users_in_subscription?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +h2 :users_in_subscription+
-        # @return [String] The text content or value of +users_in_subscription+
-        def users_in_subscription
+        # @note Defined as +table :subscription_history+
+        # @return [String] The text content or value of +subscription_history+
+        def subscription_history
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.users_in_subscription_element).to exist
+        #     expect(subscription.subscription_history_element).to exist
         #   end
-        # @return [Watir::H2] The raw +H2+ element
-        def users_in_subscription_element
+        # @return [Watir::Table] The raw +Table+ element
+        def subscription_history_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_users_in_subscription
+        #     expect(subscription).to be_subscription_history
         #   end
-        # @return [Boolean] true if the +users_in_subscription+ element is present on the page
-        def users_in_subscription?
+        # @return [Boolean] true if the +subscription_history+ element is present on the page
+        def subscription_history?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +h2 :users_over_subscription+
-        # @return [String] The text content or value of +users_over_subscription+
-        def users_over_subscription
+        # @note Defined as +div :no_valid_license_alert+
+        # @return [String] The text content or value of +no_valid_license_alert+
+        def no_valid_license_alert
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.users_over_subscription_element).to exist
+        #     expect(subscription.no_valid_license_alert_element).to exist
         #   end
-        # @return [Watir::H2] The raw +H2+ element
-        def users_over_subscription_element
+        # @return [Watir::Div] The raw +Div+ element
+        def no_valid_license_alert_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_users_over_subscription
+        #     expect(subscription).to be_no_valid_license_alert
         #   end
-        # @return [Boolean] true if the +users_over_subscription+ element is present on the page
-        def users_over_subscription?
+        # @return [Boolean] true if the +no_valid_license_alert+ element is present on the page
+        def no_valid_license_alert?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
-        # @note Defined as +table :subscription_history+
-        # @return [String] The text content or value of +subscription_history+
-        def subscription_history
+        # @note Defined as +h3 :no_active_subscription_title+
+        # @return [String] The text content or value of +no_active_subscription_title+
+        def no_active_subscription_title
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription.subscription_history_element).to exist
+        #     expect(subscription.no_active_subscription_title_element).to exist
         #   end
-        # @return [Watir::Table] The raw +Table+ element
-        def subscription_history_element
+        # @return [Watir::H3] The raw +H3+ element
+        def no_active_subscription_title_element
           # This is a stub, used for indexing. The method is dynamically generated.
         end
 
         # @example
         #   Gitlab::Page::Admin::Subscription.perform do |subscription|
-        #     expect(subscription).to be_subscription_history
+        #     expect(subscription).to be_no_active_subscription_title
         #   end
-        # @return [Boolean] true if the +subscription_history+ element is present on the page
-        def subscription_history?
+        # @return [Boolean] true if the +no_active_subscription_title+ element is present on the page
+        def no_active_subscription_title?
           # This is a stub, used for indexing. The method is dynamically generated.
         end
       end