Skip to content

Commit

Permalink
[CHE 6] Rework selenium page objects for Dashboard (#7583)
Browse files Browse the repository at this point in the history
* changed dashboard selenium page objects
* the WorspaceDetails page object was divided
  • Loading branch information
Sergey Skorik committed Dec 4, 2017
1 parent f7907fc commit bf9df59
Show file tree
Hide file tree
Showing 49 changed files with 1,839 additions and 1,725 deletions.
24 changes: 12 additions & 12 deletions dashboard/src/app/navbar/navbar.html
Expand Up @@ -10,7 +10,7 @@
Red Hat, Inc. - initial API and implementation
-->
<div class="left-sidebar-container">
<div class="left-sidebar-container" id="navbar">
<md-toolbar class="flex-shrink-none">
<md-progress-linear md-mode="indeterminate" ng-hide="navbarController.profile && navbarController.profile.userId"></md-progress-linear>
<div ng-show="navbarController.profile && navbarController.profile.userId"
Expand All @@ -21,7 +21,7 @@
<section class="navbar-top-logo logo-color-white" layout="column" layout-align="center left" ng-include="branding.logoText">
</section>
<div flex></div>
<navbar-notification></navbar-notification>
<navbar-notification id="navbar-notification-container"></navbar-notification>
</div>

<md-divider md-theme="factory-theme"></md-divider>
Expand All @@ -32,15 +32,15 @@
<md-list-item flex class="navbar-subsection-item">
<md-button nav-bar-selected flex che-reload-href href="{{navbarController.menuItemUrl.dashboard}}" layout-align="left"
target="_self">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="dashboard-item">
<md-icon md-font-icon="navbar-icon chefont cheico-dashboard" aria-label="Dashboard"></md-icon>
<span>Dashboard</span>
</div>
</md-button>
</md-list-item>
<md-list-item flex class="navbar-subsection-item">
<md-button nav-bar-selected flex che-reload-href href="{{navbarController.menuItemUrl.workspaces}}" layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="workspaces-item">
<md-icon md-font-icon="navbar-icon chefont cheico-workspace"></md-icon>
<span>Workspaces</span>
<span class="navbar-number" ng-show="navbarController.getWorkspacesNumber()">&nbsp;({{navbarController.getWorkspacesNumber()}})</span>
Expand All @@ -50,7 +50,7 @@
<md-list-item flex class="navbar-subsection-item">
<md-button nav-bar-selected flex che-reload-href
href="{{navbarController.menuItemUrl.stacks}}" layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="stacks-item">
<md-icon md-font-icon="navbar-icon material-design icon-ic_inbox_24px"></md-icon>
<span>Stacks</span>
</div>
Expand All @@ -59,7 +59,7 @@
<md-list-item flex class="navbar-subsection-item">
<md-button nav-bar-selected flex che-reload-href
href="{{navbarController.menuItemUrl.factories}}" layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="factories-item">
<md-icon md-font-icon="navbar-icon chefont cheico-factory"></md-icon>
<span>Factories</span>
<span class="navbar-number" ng-show="navbarController.getFactoriesNumber()">&nbsp;({{navbarController.getFactoriesNumber()}})</span>
Expand All @@ -69,7 +69,7 @@
<md-list-item flex class="navbar-subsection-item">
<md-button nav-bar-selected flex che-reload-href
href="{{navbarController.menuItemUrl.administration}}" layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="administration-item">
<md-icon md-font-icon="navbar-icon material-design icon-ic_settings_24px"></md-icon>
<span>Administration</span>
</div>
Expand Down Expand Up @@ -103,7 +103,7 @@
<md-button nav-bar-selected flex che-reload-href
href="{{navbarController.menuItemUrl.usermanagement}}"
layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="users-item">
<i class="fa fa-user fa-lg navbar-icon"></i>
<span>Users</span>
</div>
Expand All @@ -113,7 +113,7 @@
ng-if="navbarController.userServices.hasInstallationManagerService">
<md-button nav-bar-selected flex che-reload-href
href="{{navbarController.menuItemUrl.organizations}}" layout-align="left">
<div class="navbar-item" layout="row" layout-align="start center">
<div class="navbar-item" layout="row" layout-align="start center" id="organizations-item">
<md-icon md-font-icon="fa navbar-icon fa-sitemap"></md-icon>
<span>Organizations</span>
<span class="navbar-number" ng-show="navbarController.getRootOrganizationsNumber()">&nbsp;({{navbarController.getRootOrganizationsNumber()}})</span>
Expand All @@ -139,12 +139,12 @@
navbar-dropdown-items="navbarController.accountItems"
navbar-dropdown-offset="15 -45">
<md-button ng-href="" layout-align="left">
<div class="navbar-item navbar-identity" layout="row" layout-align="start center">
<div class="navbar-item navbar-identity" layout="row" layout-align="start center" id="navbar-user-panel">

<i class="navbar-icon" flex="none">
<img class="developers-face" gravatar-src="navbarController.profile.email"/>
<img class="developers-face" id="developers-face" gravatar-src="navbarController.profile.email"/>
</i>
<span flex style="text-align: left;">{{navbarController.getUserName()}}</span>
<span flex style="text-align: left;" id="user-name">{{navbarController.getUserName()}}</span>
<i class="fa fa-angle-up navbar-icon" aria-hidden="true"></i>
</div>
</md-button>
Expand Down
@@ -1,5 +1,6 @@
<che-toolbar che-title="New Workspace">
<che-button-save-flat class="create-workspace-header-button"
id="create-workspace-button"
che-button-title="Create"
ng-click="createWorkspaceController.createWorkspace()"
ng-disabled="createWorkspaceController.isCreateButtonDisabled()"></che-button-save-flat>
Expand All @@ -23,6 +24,7 @@
<che-input-box ng-init="createWorkspaceController.registerForm('name', workspaceNameForm)"
che-form="workspaceNameForm"
che-name="workspaceName"
id="workspace-name-input"
che-place-holder="Name of the workspace"
aria-label="Name of the workspace"
ng-model="createWorkspaceController.workspaceName"
Expand Down
Expand Up @@ -7,14 +7,19 @@
md-theme="default"
flex-order="2" flex-order-gt-md="1">
<che-toggle-joined-button che-title="Samples"
id="samples-button"
che-value="addImportProjectController.projectSource.SAMPLES"></che-toggle-joined-button>
<che-toggle-joined-button che-title="Blank"
id="blank-button"
che-value="addImportProjectController.projectSource.BLANK"></che-toggle-joined-button>
<che-toggle-joined-button che-title="Git"
id="git-button"
che-value="addImportProjectController.projectSource.GIT"></che-toggle-joined-button>
<che-toggle-joined-button che-title="GitHub"
id="github-button"
che-value="addImportProjectController.projectSource.GITHUB"></che-toggle-joined-button>
<che-toggle-joined-button che-title="Zip"
id="zip-button"
che-value="addImportProjectController.projectSource.ZIP"></che-toggle-joined-button>
</che-toggle-joined>
</div>
Expand All @@ -38,10 +43,12 @@
<div class="add-import-project-button"
flex layout="row" layout-align="end center">
<che-button-cancel-flat che-button-title="Cancel"
id="cancel-button"
name="cancelButton"
ng-disabled="addImportProjectController.disableSaveAndCancelButtons()"
ng-click="addImportProjectController.projectTemplateOnCancel()"></che-button-cancel-flat>
<che-button-primary che-button-title="Add"
id="add-project-button"
name="addButton"
ng-disabled="addImportProjectForm.$invalid || addImportProjectController.disableSaveAndCancelButtons()"
ng-click="addImportProjectController.projectTemplateOnSave()"></che-button-primary>
Expand Down
Expand Up @@ -4,6 +4,7 @@
<che-input-box ng-init="importGitProjectController.registerForm(importGitProjectForm)"
che-form="importGitProjectForm"
che-name="remoteGitURL"
id="remote-git-url-input"
che-label-name="Git URL"
che-place-holder="Url of the git repository"
aria-label="Url of the git repository"
Expand Down
Expand Up @@ -4,6 +4,7 @@
<che-input-box ng-init="importZipProjectController.registerForm(importZipProjectForm)"
che-form="importZipProjectForm"
che-name="remoteZipURL"
id="remote-zip-url-input"
che-label-name="Zip URL"
che-place-holder="Url of the zip file"
aria-label="Url of the zip file"
Expand All @@ -17,6 +18,7 @@
<div layout="row" layout-align="left" class="skip-root-container">
<div flex="20"></div>
<md-checkbox ng-model="importZipProjectController.skipFirstLevel"
id="zip-skip-root-folder-checkbox"
ng-change="importZipProjectController.onCheckboxChanged()"
aria-label="Skip the root folder of the archive">
Skip the root folder of the archive
Expand Down
Expand Up @@ -12,6 +12,7 @@
class="che-checkbox-area template-selector-item-checkbox">
<che-list-item-checked ng-model="templateIsChecked[template.name]"
che-aria-label-checkbox="Sample {{template.name}}"
id="sample-{{template.name}}"
ng-click="onTemplateClick()"></che-list-item-checked>
</div>

Expand Down
@@ -1,4 +1,4 @@
<div class="project-source-selector">
<div class="project-source-selector" id="project-source-selector">

<!-- Toggle buttons -->
<div class="che-template-checker">
Expand Down
Expand Up @@ -10,12 +10,16 @@
md-theme="default"
flex-order="2" flex-order-gt-md="1">
<che-toggle-joined-button che-title="All"
id="all-stacks-button"
che-value="stackSelectorController.scope.ALL"></che-toggle-joined-button>
<che-toggle-joined-button che-title="Quick Start"
id="quick-start-button"
che-value="stackSelectorController.scope.QUICK_START"></che-toggle-joined-button>
<che-toggle-joined-button che-title="Single Machine"
id="single-machine-button"
che-value="stackSelectorController.scope.SINGLE_MACHINE"></che-toggle-joined-button>
<che-toggle-joined-button che-title="Multi Machine"
id="multi-machine-button"
che-value="stackSelectorController.scope.MULTI_MACHINE"></che-toggle-joined-button>
</che-toggle-joined>

Expand All @@ -27,6 +31,7 @@
layout="row"
layout-align="start center" layout-align-gt-md="end center">
<toggle-button-popover button-title="Filters"
id="filter-stacks-button"
button-font-icon="fa fa-sliders"
che-popover-trigger-outside-click="true"
ng-class="{'stack-selector-active-tags-filter': stackSelectorController.selectedTags.length}">
Expand All @@ -36,10 +41,12 @@
</che-stack-library-filter>
</toggle-button-popover>
<che-button-default che-button-title="Add Stack"
id="add-stack-button"
che-button-icon="material-design icon-ic_add_24px"
name="addStack"
ng-click="stackSelectorController.onAddStack()"></che-button-default>
<search-input search-placeholder="Search"
id="search-stack-input"
search-on-change="stackSelectorController.searchChanged(search)"></search-input>
</div>
</div>
Expand Down
@@ -1,11 +1,11 @@
<div class="che-workspace-button">
<che-button-default ng-if="showStopButton===false"
id="runButton"
id="run-workspace-button"
ng-disabled="isDisabled"
che-button-title="Run"
ng-click="onRunWorkspace()"></che-button-default>
<che-button-default ng-if="showStopButton"
id="stopButton"
id="stop-workspace-button"
ng-disabled="isDisabled"
che-button-title="Stop"
ng-click="onStopWorkspace()"></che-button-default>
Expand Down
Expand Up @@ -10,6 +10,7 @@
on-stop-workspace="workspaceDetailsController.stopWorkspace()"
on-run-workspace="workspaceDetailsController.runWorkspace()"></workspace-status-button>
<che-button-default ng-if="workspaceDetailsController.editMode === false"
id="open-in-ide-button"
che-button-title="Open"
href="#/ide/{{workspaceDetailsController.namespaceId}}/{{workspaceDetailsController.workspaceName}}"></che-button-default>
</div>
Expand Down

0 comments on commit bf9df59

Please sign in to comment.