From a03009746bb3e0edbe1d81901653b5659f8784b5 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Thu, 2 Apr 2020 15:52:44 -0700 Subject: [PATCH] Refactor page-size-select page object into a reusable component --- ui/tests/pages/clients/list.js | 12 ++---------- ui/tests/pages/components/page-size-select.js | 12 ++++++++++++ ui/tests/pages/jobs/job/task-group.js | 12 ++---------- ui/tests/pages/jobs/list.js | 12 ++---------- 4 files changed, 18 insertions(+), 30 deletions(-) create mode 100644 ui/tests/pages/components/page-size-select.js diff --git a/ui/tests/pages/clients/list.js b/ui/tests/pages/clients/list.js index 620c7e047..c0d04319a 100644 --- a/ui/tests/pages/clients/list.js +++ b/ui/tests/pages/clients/list.js @@ -12,6 +12,7 @@ import { } from 'ember-cli-page-object'; import facet from 'nomad-ui/tests/pages/components/facet'; +import pageSizeSelect from 'nomad-ui/tests/pages/components/page-size-select'; export default create({ pageSize: 25, @@ -61,16 +62,7 @@ export default create({ headline: text('[data-test-empty-clients-list-headline]'), }, - pageSizeSelect: { - isPresent: isPresent('[data-test-page-size-select]'), - open: clickable('[data-test-page-size-select] .ember-power-select-trigger'), - selectedOption: text('[data-test-page-size-select] .ember-power-select-selected-item'), - options: collection('.ember-power-select-option', { - testContainer: '#ember-testing', - resetScope: true, - label: text(), - }), - }, + pageSizeSelect: pageSizeSelect(), error: { isPresent: isPresent('[data-test-error]'), diff --git a/ui/tests/pages/components/page-size-select.js b/ui/tests/pages/components/page-size-select.js new file mode 100644 index 000000000..ef664643d --- /dev/null +++ b/ui/tests/pages/components/page-size-select.js @@ -0,0 +1,12 @@ +import { clickable, collection, isPresent, text } from 'ember-cli-page-object'; + +export default () => ({ + isPresent: isPresent('[data-test-page-size-select]'), + open: clickable('[data-test-page-size-select] .ember-power-select-trigger'), + selectedOption: text('[data-test-page-size-select] .ember-power-select-selected-item'), + options: collection('.ember-power-select-option', { + testContainer: '#ember-testing', + resetScope: true, + label: text(), + }), +}); diff --git a/ui/tests/pages/jobs/job/task-group.js b/ui/tests/pages/jobs/job/task-group.js index 327d31d0b..d3d6b048d 100644 --- a/ui/tests/pages/jobs/job/task-group.js +++ b/ui/tests/pages/jobs/job/task-group.js @@ -11,6 +11,7 @@ import { import allocations from 'nomad-ui/tests/pages/components/allocations'; import error from 'nomad-ui/tests/pages/components/error'; +import pageSizeSelect from 'nomad-ui/tests/pages/components/page-size-select'; export default create({ pageSize: 25, @@ -52,14 +53,5 @@ export default create({ headline: text('[data-test-empty-allocations-list-headline]'), }, - pageSizeSelect: { - isPresent: isPresent('[data-test-page-size-select]'), - open: clickable('[data-test-page-size-select] .ember-power-select-trigger'), - selectedOption: text('[data-test-page-size-select] .ember-power-select-selected-item'), - options: collection('.ember-power-select-option', { - testContainer: '#ember-testing', - resetScope: true, - label: text(), - }), - }, + pageSizeSelect: pageSizeSelect(), }); diff --git a/ui/tests/pages/jobs/list.js b/ui/tests/pages/jobs/list.js index 4d1839d71..a6286564d 100644 --- a/ui/tests/pages/jobs/list.js +++ b/ui/tests/pages/jobs/list.js @@ -11,6 +11,7 @@ import { } from 'ember-cli-page-object'; import facet from 'nomad-ui/tests/pages/components/facet'; +import pageSizeSelect from 'nomad-ui/tests/pages/components/page-size-select'; export default create({ pageSize: 25, @@ -64,16 +65,7 @@ export default create({ }), }, - pageSizeSelect: { - isPresent: isPresent('[data-test-page-size-select]'), - open: clickable('[data-test-page-size-select] .ember-power-select-trigger'), - selectedOption: text('[data-test-page-size-select] .ember-power-select-selected-item'), - options: collection('.ember-power-select-option', { - testContainer: '#ember-testing', - resetScope: true, - label: text(), - }), - }, + pageSizeSelect: pageSizeSelect(), facets: { type: facet('[data-test-type-facet]'),