diff --git a/CHANGELOG.md b/CHANGELOG.md index f30e2027b6..d4ccb0f0ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## (2020-07-10) + + +#### Bug Fixes + +* **lifetime:** mod req lifetime string adjusted. try catch exception. ([97ddb284](97ddb284)) +* **mod-req:** submit disabled if no edam ([f96ad419](f96ad419)) + ## (2020-06-18) diff --git a/e2e/page_objects/login.po.ts b/e2e/page_objects/login.po.ts index 64c7584327..7e3ead0621 100644 --- a/e2e/page_objects/login.po.ts +++ b/e2e/page_objects/login.po.ts @@ -32,7 +32,7 @@ export class LoginPage { } static async useGoogle(email: string, psw: string): Promise { - await element(by.linkText('Sign in with Google')).click() + await Util.clickElementByLinkText('Sign in with Google') // Input Email await Util.waitForPage('accounts.google.com/o/oauth2/'); await Util.sendTextToElementById('identifierId', email, false); diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index de214c003f..2fd746853b 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -30,6 +30,7 @@ exports.config = { allScriptsTimeout: 11000, specs: [ 'tests/simple_vm_application_test.ts', + 'tests/simple_vm_approval_test.ts', 'tests/member_test.ts', 'tests/simple_vm_modification_test.ts', @@ -38,7 +39,7 @@ exports.config = { 'tests/cloud_application_test.ts', 'tests/cloud_application_approval_test.ts', 'tests/cloud_application_modification_test.ts', - 'tests/cloud_modification_approval_test.ts', + 'tests/cloud_modification_approval_test.ts',*/ 'tests/virtual_machine_tests.ts', 'tests/terminate_all_pt.ts' ], diff --git a/e2e/util.ts b/e2e/util.ts index 2e8c44e18a..cf8aa99310 100644 --- a/e2e/util.ts +++ b/e2e/util.ts @@ -114,6 +114,23 @@ export class Util { return await elem.sendKeys(text); } + static async clickElementByLinkText(text: string): Promise { + await Util.waitForElementToBeClickableByLinkText(text) + console.log('Clicking element with text:') + + return await element(by.linkText('Sign in with Google')).click(); + + } + + static async waitForElementToBeClickableByLinkText(text: string, timeout: number = this.timeout): Promise { + const until_: ProtractorExpectedConditions = protractor.ExpectedConditions; + + console.log(`Waiting until element is clickable with text: ${text}`); + const elem: ElementFinder = element(by.linkText(text)); + + return await browser.driver.wait(until_.elementToBeClickable(elem), timeout, 'Element taking too long to be clickable'); + } + static async sendTextToElementById(id: string, text: string, show_output: boolean = true): Promise { await this.waitForVisibilityOfElementById(id); if (show_output) { diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html index 92fa6f0ef4..6cd2b50b69 100644 --- a/src/app/applications/application-detail/application-detail.component.html +++ b/src/app/applications/application-detail/application-detail.component.html @@ -5,7 +5,8 @@
  • Informations
  • Resources
    • + (click)="setTab(RESOURCE_TAB)">Current Resources +
  • - {{application?.project_lifetime_request.user.username}} + {{application?.project_lifetime_request?.user?.username}} + ( {{application?.project_lifetime_request?.user?.email}} | {{application?.project_lifetime_request?.user?.elixir_id}} ) diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 3a35d41c57..b8fb3a381f 100644 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -327,8 +327,8 @@
    - -
    + (click)="selectedCluster=cluster; verifyModal.show()" onClick="return false;"> Delete @@ -144,7 +144,7 @@
    <copy command> diff --git a/src/app/virtualmachines/vmOverview.component.html b/src/app/virtualmachines/vmOverview.component.html index 99e115c44c..22a2f77ff9 100644 --- a/src/app/virtualmachines/vmOverview.component.html +++ b/src/app/virtualmachines/vmOverview.component.html @@ -299,24 +299,24 @@ + (click)="selectedVm=vm; vm.cardState=1" > How to connect ... + (click)="selectedVm=vm; vm.cardState=0;" > ... Hide information
    + (click)="selectedVm=vm; vm.cardState=2;" > Show actions ... + (click)="selectedVm=vm; vm.cardState=0;" > ... Hide actions