Skip to content

Commit

Permalink
copy shared test utils to kubevirt
Browse files Browse the repository at this point in the history
  • Loading branch information
glekner committed Jul 14, 2021
1 parent 6427450 commit 7f641d6
Show file tree
Hide file tree
Showing 59 changed files with 403 additions and 106 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
removeLeakedResources,
withResource,
withResources,
} from '@console/shared/src/test-utils/utils';
} from '../utils/shared-utils';
import * as pvcView from '../views/pvc.view';
import { restrictedAccessBlock } from '../views/vms.list.view';
import { uploadLink } from '../views/wizard.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
removeLeakedResources,
withResource,
withResources,
} from '@console/shared/src/test-utils/utils';
} from '../utils/shared-utils';
import { typeWarnMessage } from '../views/pvc.view';
import { bootSource, vmtLinkByName } from '../views/template.view';
import { AccessMode, getTestDataVolume, VolumeMode } from './mocks/mocks';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { browser, ExpectedConditions as until } from 'protractor';
import { click, fillInput } from '@console/shared/src/test-utils/utils';
import { click, fillInput } from '../../utils/shared-utils';
import * as view from '../../views/dialogs/cloneVirtualMachineDialog.view';
import { PAGE_LOAD_TIMEOUT_SECS, SEC } from '../utils/constants/common';
import { selectOptionByText } from '../utils/utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { $, browser, ExpectedConditions as until } from 'protractor';
import { click, fillInput } from '@console/shared/src/test-utils/utils';
import { click, fillInput } from '../../utils/shared-utils';
import * as view from '../../views/dialogs/diskDialog.view';
import { modalSubmitButton, saveButton } from '../../views/kubevirtUIResource.view';
import { errorHelper, modalCancelButton, waitForNoLoaders } from '../../views/wizard.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { click, fillInput } from '@console/shared/src/test-utils/utils';
import { click, fillInput } from '../../utils/shared-utils';
import * as view from '../../views/dialogs/networkInterface.view';
import * as wizardView from '../../views/importWizard.view';
import { modalSubmitButton, saveButton } from '../../views/kubevirtUIResource.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-await-in-loop */
import { MatchLabels } from '@console/internal/module/k8s';
import { asyncForEach, click, fillInput } from '@console/shared/src/test-utils/utils';
import { asyncForEach, click, fillInput } from '../../utils/shared-utils';
import * as view from '../../views/dialogs/editLabelView';

export class AddDialog {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { execSync } from 'child_process';
import * as _ from 'lodash';
import { browser, ExpectedConditions as until } from 'protractor';
import { isLoaded, resourceTitle } from '@console/internal-integration-tests/views/crud.view';
import { resolveTimeout, selectDropdownOption } from '@console/shared/src/test-utils/utils';
import { resolveTimeout, selectDropdownOption } from '../../utils/shared-utils';
import { nameInput as cloneDialogNameInput } from '../../views/dialogs/cloneVirtualMachineDialog.view';
import * as vmView from '../../views/virtualMachine.view';
import { Disk, Network } from '../types/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { browser } from 'protractor';
import { createItemButton, isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
import { K8sKind } from '@console/internal/module/k8s';
import { asyncForEach, click } from '@console/shared/src/test-utils/utils';
import { asyncForEach, click } from '../../utils/shared-utils';
import * as view from '../../views/importWizard.view';
import { saveButton, tableRows } from '../../views/kubevirtUIResource.view';
import * as rhvView from '../../views/rhvImportWizard.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { clickHorizontalTab } from '@console/internal-integration-tests/views/ho
import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
import { K8sKind } from '@console/internal/module/k8s';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import { confirmAction } from '@console/shared/src/test-utils/actions.view';
import { click } from '@console/shared/src/test-utils/utils';
import { confirmAction } from '../../utils/shared-actions.view';
import { click } from '../../utils/shared-utils';
import * as editDedicatedResourcesView from '../../views/dialogs/editDedicatedResourcesView';
import * as editStatusView from '../../views/dialogs/editStatusView';
import * as kubevirtDetailView from '../../views/kubevirtUIResource.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import * as crudView from '@console/internal-integration-tests/views/crud.view';
import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
import { PersistentVolumeClaimModel } from '@console/internal/models';
import { click } from '@console/shared/src/test-utils/utils';
import { click } from '../../utils/shared-utils';
import { listViewAction } from '../../views/actions.view';
import * as pvcView from '../../views/pvc.view';
import { getTestDataVolume } from '../mocks/mocks';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
saveChangesBtn,
} from '@console/internal-integration-tests/views/crud.view';
import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.view';
import { click, fillInput } from '@console/shared/src/test-utils/utils';
import { click, fillInput } from '../../utils/shared-utils';
import * as pvcView from '../../views/pvc.view';
import { dropDownItem } from '../../views/uiResource.view';
import { PVCData } from '../types/pvc';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { browser, ExpectedConditions as until } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import { click, fillInput } from '@console/shared/src/test-utils/utils';
import { click, fillInput } from '../../utils/shared-utils';
import * as view from '../../views/importWizard.view';
import * as rhvView from '../../views/rhvImportWizard.view';
import * as wizardView from '../../views/wizard.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resourceTitle } from '@console/internal-integration-tests/views/crud.view';
import { K8sKind } from '@console/internal/module/k8s/types';
import { click } from '@console/shared/src/test-utils/utils';
import { click } from '../../utils/shared-utils';
import * as view from '../../views/uiResource.view';
import { apiVersionForModel } from '../utils/selectors';
import { getResourceObject } from '../utils/utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { browser, ExpectedConditions as until } from 'protractor';
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { modalOverlay } from '@console/kubevirt-plugin/integration-tests/views/uiResource.view';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import { click, waitForStringNotInElement } from '@console/shared/src/test-utils/utils';
import { MatchLabels } from 'public/module/k8s';
import { cloneDeepWithEnum } from '../../../src/constants/object-enum';
import { click, waitForStringNotInElement } from '../../utils/shared-utils';
import { detailViewAction, listViewAction } from '../../views/actions.view';
import { saveButton } from '../../views/kubevirtUIResource.view';
import { vmtLinkByName } from '../../views/template.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { detailViewAction, listViewAction } from '@console/shared/src/test-utils/actions.view';
/* eslint-disable no-await-in-loop */
import { click } from '@console/shared/src/test-utils/utils';
import { cloneDeepWithEnum } from '../../../src/constants/object-enum';
import { detailViewAction, listViewAction } from '../../utils/shared-actions.view';
/* eslint-disable no-await-in-loop */
import { click } from '../../utils/shared-utils';
import { templateCreateVMLink, vmtLinkByName, vmtTitle } from '../../views/template.view';
import { VirtualMachineTemplateModel } from '../types/types';
import { VMTemplateBuilderData } from '../types/vm';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { browser, ExpectedConditions as until } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import { asyncForEach, click, fillInput } from '@console/shared/src/test-utils/utils';
import { asyncForEach, click, fillInput } from '../../utils/shared-utils';
import * as view from '../../views/importWizard.view';
import * as wizardView from '../../views/wizard.view';
import { InstanceConfig, VMImportConfig, vmwareConfig } from '../types/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { clickNavLink } from '@console/internal-integration-tests/views/sidenav.
import { TemplateModel } from '@console/internal/models';
import { K8sKind } from '@console/internal/module/k8s';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import { asyncForEach, click, fillInput } from '@console/shared/src/test-utils/utils';
import { asyncForEach, click, fillInput } from '../../utils/shared-utils';
import { diskStorageClass } from '../../views/dialogs/diskDialog.view';
import { confirmActionButton } from '../../views/importWizard.view';
import { continueButton, modalTitle, saveButton } from '../../views/kubevirtUIResource.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
saveButton,
} from '@console/internal-integration-tests/views/yaml.view';
import { MatchLabels } from '@console/internal/module/k8s';
import { click } from '@console/shared/src/test-utils/utils';
import { click } from '../../utils/shared-utils';
import { filterCount } from '../../views/vms.list.view';
import { createItemButton, createWithYAMLButton } from '../../views/wizard.view';
import { NodePortService, Status } from '../types/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
createResource,
removeLeakableResource,
removeLeakedResources,
} from '@console/shared/src/test-utils/utils';
} from '../utils/shared-utils';
import { unpauseButton } from '../views/dialogs/editStatusView';
import { vmLinkByName } from '../views/vms.list.view';
import { getVMManifest } from './mocks/mocks';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
resourceRows,
resourceRowsPresent,
} from '@console/internal-integration-tests/views/crud.view';
import { getDataVolumeTemplates, getVolumes } from '../../src/selectors/vm/selectors';
import {
addLeakableResource,
applyResource,
Expand All @@ -19,8 +20,7 @@ import {
removeLeakedResources,
waitForCount,
withResource,
} from '@console/shared/src/test-utils/utils';
import { getDataVolumeTemplates, getVolumes } from '../../src/selectors/vm/selectors';
} from '../utils/shared-utils';
import * as cloneDialogView from '../views/dialogs/cloneVirtualMachineDialog.view';
import { CloneVirtualMachineDialog } from './dialogs/cloneVirtualMachineDialog';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import { $, browser, ExpectedConditions as until } from 'protractor';
import {
detailViewAction,
getDetailActionDropdownOptions,
} from '@console/shared/src/test-utils/actions.view';
import {
click,
deleteResource,
waitForStringInElement,
} from '@console/shared/src/test-utils/utils';
import { detailViewAction, getDetailActionDropdownOptions } from '../utils/shared-actions.view';
import { click, deleteResource, waitForStringInElement } from '../utils/shared-utils';
import { confirmButton } from '../views/uiResource.view';
import { vmDetailNode } from '../views/virtualMachine.view';
import { getBasicVMBuilder } from './mocks/vmBuilderPresets';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as _ from 'lodash';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { resourceTitle } from '@console/internal-integration-tests/views/crud.view';
import { asyncForEach, createResource, deleteResource } from '@console/shared/src/test-utils/utils';
import { asyncForEach, createResource, deleteResource } from '../utils/shared-utils';
import * as vmView from '../views/virtualMachine.view';
import { getVMManifest } from './mocks/mocks';
import { VirtualMachine } from './models/virtualMachine';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as _ from 'lodash';
import { browser } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { click, createResource, deleteResource } from '@console/shared/src/test-utils/utils';
import { getBootableDevicesInOrder, getNonBootableDevices } from '../../src/selectors/vm/devices';
import { click, createResource, deleteResource } from '../utils/shared-utils';
import * as bootOrderView from '../views/dialogs/editBootOrderView';
import { saveButton } from '../views/kubevirtUIResource.view';
import { getVMManifest, hddDisk } from './mocks/mocks';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { browser, ExpectedConditions as until } from 'protractor';
import { click, removeLeakedResources, withResource } from '@console/shared/src/test-utils/utils';
import { isDedicatedCPUPlacement } from '../../src/selectors/vm';
import { click, removeLeakedResources, withResource } from '../utils/shared-utils';
import * as editDedicatedResourcesView from '../views/dialogs/editDedicatedResourcesView';
import { saveButton } from '../views/kubevirtUIResource.view';
import * as virtualMachineView from '../views/virtualMachine.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { execSync } from 'child_process';
import { browser } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { getCPU, getMemory } from '../../src/selectors/vm/selectors';
import {
click,
createResource,
deleteResource,
fillInput,
removeLeakedResources,
withResource,
} from '@console/shared/src/test-utils/utils';
import { getCPU, getMemory } from '../../src/selectors/vm/selectors';
} from '../utils/shared-utils';
import * as editFlavorView from '../views/dialogs/editFlavorView';
import { saveButton } from '../views/kubevirtUIResource.view';
import * as virtualMachineView from '../views/virtualMachine.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { browser, ExpectedConditions as until } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { MatchLabels } from '@console/internal/module/k8s';
import { click, createResource, deleteResource } from '@console/shared/src/test-utils/utils';
import { click, createResource, deleteResource } from '../utils/shared-utils';
import * as editAffinityView from '../views/dialogs/editAffinityView';
import { saveButton } from '../views/kubevirtUIResource.view';
import * as virtualMachineView from '../views/virtualMachine.view';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { execSync } from 'child_process';
import { browser, ExpectedConditions as until } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { detailViewAction as vmActions } from '@console/shared/src/test-utils/actions.view';
import { detailViewAction as vmActions } from '../utils/shared-actions.view';
import {
click,
createResource,
Expand All @@ -10,7 +10,7 @@ import {
selectDropdownOption,
selectDropdownOptionById,
waitForStringInElement,
} from '@console/shared/src/test-utils/utils';
} from '../utils/shared-utils';
import {
consoleTypeSelector,
consoleTypeSelectorId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { createResource, deleteResource } from '@console/shared/src/test-utils/utils';
import { createResource, deleteResource } from '../utils/shared-utils';
import { filterCount } from '../views/vms.list.view';
import { getVMManifest } from './mocks/mocks';
import { VirtualMachine } from './models/virtualMachine';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { browser } from 'protractor';
import { appHost, testName } from '@console/internal-integration-tests/protractor.conf';
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import {
click,
createResources,
deleteResources,
fillInput,
} from '@console/shared/src/test-utils/utils';
import { click, createResources, deleteResources, fillInput } from '../utils/shared-utils';
import * as bootOrderView from '../views/dialogs/editBootOrderView';
import * as editFlavorView from '../views/dialogs/editFlavorView';
import { saveButton, tableRows } from '../views/kubevirtUIResource.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { browser } from 'protractor';
import { appHost, testName } from '@console/internal-integration-tests/protractor.conf';
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import { getInterfaces } from '../../src/selectors/vm/selectors';
import { getVMIDisks } from '../../src/selectors/vmi/basic';
import {
click,
createResource,
createResources,
deleteResource,
deleteResources,
withResource,
} from '@console/shared/src/test-utils/utils';
import { getInterfaces } from '../../src/selectors/vm/selectors';
import { getVMIDisks } from '../../src/selectors/vmi/basic';
} from '../utils/shared-utils';
import { nicModel, nicType } from '../views/dialogs/networkInterface.view';
import { createNICButton } from '../views/kubevirtUIResource.view';
import { dropDownItemMain, dropDownList } from '../views/uiResource.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
createResource,
deleteResource,
selectDropdownOptionById,
} from '@console/shared/src/test-utils/utils';
} from '../utils/shared-utils';
import {
consoleTypeSelectorId,
openInNewWindow,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
createResources,
deleteResources,
waitForStringInElement,
} from '@console/shared/src/test-utils/utils';
} from '../utils/shared-utils';
import * as dashboardView from '../views/dashboard.view';
import { getVMManifest, hddDisk, multusNAD, multusNetworkInterface } from './mocks/mocks';
import { VirtualMachine } from './models/virtualMachine';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { browser, ExpectedConditions as until, Key } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { isLoaded } from '@console/internal-integration-tests/views/crud.view';
import { addVariableFrom } from '@console/internal-integration-tests/views/environment.view';
import { click, createResources, deleteResources } from '@console/shared/src/test-utils/utils';
import { click, createResources, deleteResources } from '../utils/shared-utils';
import { saveButton } from '../views/kubevirtUIResource.view';
import * as vmEnv from '../views/vm.environment.view';
import { getConfigMap, getSecret, getServiceAccount, getVMManifest } from './mocks/mocks';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { browser, ExpectedConditions as until } from 'protractor';
import { testName } from '@console/internal-integration-tests/protractor.conf';
import { READY } from '../../src/utils/strings';
import {
addLeakableResource,
click,
createResource,
removeLeakedResources,
} from '@console/shared/src/test-utils/utils';
import { READY } from '../../src/utils/strings';
} from '../utils/shared-utils';
import { listViewAction } from '../views/actions.view';
import { saveButton } from '../views/kubevirtUIResource.view';
import * as editVMSnapshotsView from '../views/vm.snapshots.view';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ import {
setEditorContent,
} from '@console/internal-integration-tests/views/yaml.view';
import { VirtualMachineModel } from '@console/kubevirt-plugin/src/models';
import {
click,
createResource,
deleteResource,
withResource,
} from '@console/shared/src/test-utils/utils';
import { click, createResource, deleteResource, withResource } from '../utils/shared-utils';
import { activeTab } from '../views/uiResource.view';
import { virtualizationTitle } from '../views/vms.list.view';
import { createItemButton, createWithYAMLButton } from '../views/wizard.view';
Expand Down

0 comments on commit 7f641d6

Please sign in to comment.