Commit ccd12b43 authored by Simon Knox's avatar Simon Knox

Merge branch 'e2e-qaselector-admin' into 'master'

Add qa-selector to page element on admin license page

See merge request gitlab-org/gitlab!57559
parents 922d9e58 f78cad96
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.col-sm-6.d-flex.gl-mb-5 .col-sm-6.d-flex.gl-mb-5
.gl-card .gl-card
.gl-card-body .gl-card-body
%h2.gl-mt-0 %h2.gl-mt-0{ data: { "qa-selector": "users_in_license" } }
= licensed_users(@license) = licensed_users(@license)
.text-uppercase.gl-mb-4= _('Users in License') .text-uppercase.gl-mb-4= _('Users in License')
- if @license.will_expire? - if @license.will_expire?
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.col-sm-6.d-flex.gl-mb-5 .col-sm-6.d-flex.gl-mb-5
.gl-card .gl-card
.gl-card-body .gl-card-body
%h2.gl-mt-0 %h2.gl-mt-0{ data: { "qa-selector": "billable_users" } }
= number_with_delimiter @license.daily_billable_users_count = number_with_delimiter @license.daily_billable_users_count
.text-uppercase.gl-mb-4= _('Billable Users') .text-uppercase.gl-mb-4= _('Billable Users')
%p %p
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
.col-sm-6.d-flex.gl-mb-5 .col-sm-6.d-flex.gl-mb-5
.gl-card.flex-fill .gl-card.flex-fill
.gl-card-body .gl-card-body
%h2.gl-mt-0 %h2.gl-mt-0{ data: { "qa-selector": "maximum_users" } }
= number_with_delimiter @license.maximum_user_count = number_with_delimiter @license.maximum_user_count
.text-uppercase.gl-mb-4= _('Maximum Users') .text-uppercase.gl-mb-4= _('Maximum Users')
= _('This is the highest peak of users on your installation since the license started.') = _('This is the highest peak of users on your installation since the license started.')
.col-sm-6.d-flex.gl-mb-5 .col-sm-6.d-flex.gl-mb-5
.gl-card .gl-card
.gl-card-body .gl-card-body
%h2.gl-mt-0 %h2.gl-mt-0{ data: { "qa-selector": "users_over_license" } }
= number_with_delimiter users_over_license = number_with_delimiter users_over_license
.text-uppercase.gl-mb-4= _('Users over License') .text-uppercase.gl-mb-4= _('Users over License')
- if users_over_license > 0 - if users_over_license > 0
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
%ul.content-list %ul.content-list
%li %li
%span.light= _('Plan:') %span.light= _('Plan:')
%strong= @license.plan.capitalize %strong{ data: { "qa-selector": "plan_name" } }= @license.plan.capitalize
- unless @license.ultimate? - unless @license.ultimate?
= ' - ' = ' - '
= link_to _('Contact Sales to upgrade'), = link_to _('Contact Sales to upgrade'),
......
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