From 71c079186e377fb2607870002fcff575a1a1300f Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Mon, 9 Apr 2018 07:06:04 +0200 Subject: [PATCH] Fix e2e tests --- e2e-tests/manager/00-auth.js | 2 +- e2e-tests/manager/01-tree.js | 2 +- e2e-tests/manager/02-lang.js | 4 ++-- e2e-tests/manager/05-form.js | 6 +++--- e2e-tests/manager/06-form.js | 4 ++-- e2e-tests/manager/07-authParams.js | 2 +- e2e-tests/manager/07-utf8.js | 2 +- e2e-tests/manager/08-apply.js | 2 +- e2e-tests/manager/10-saml-config.js | 4 ++-- e2e-tests/manager/11-oidcop-config.js | 4 ++-- e2e-tests/manager/12-oidcrp-config.js | 6 +++--- e2e-tests/manager/35-apply-old-conf.js | 2 +- e2e-tests/manager/36-diff.js | 2 +- e2e-tests/manager/40-sessions.js | 6 +++--- e2e-tests/manager/99-logout.js | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/e2e-tests/manager/00-auth.js b/e2e-tests/manager/00-auth.js index f7cdfc377..ecbf43c75 100644 --- a/e2e-tests/manager/00-auth.js +++ b/e2e-tests/manager/00-auth.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG', function() { +describe('00 Lemonldap::NG', function() { describe('Auth mechanism', function() { diff --git a/e2e-tests/manager/01-tree.js b/e2e-tests/manager/01-tree.js index 1d6368b97..077db3cfe 100644 --- a/e2e-tests/manager/01-tree.js +++ b/e2e-tests/manager/01-tree.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('01 Lemonldap::NG Manager', function() { describe('Tree display', function() { diff --git a/e2e-tests/manager/02-lang.js b/e2e-tests/manager/02-lang.js index 836520d4e..4f5811483 100644 --- a/e2e-tests/manager/02-lang.js +++ b/e2e-tests/manager/02-lang.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('02 Lemonldap::NG Manager', function() { describe('translation', function() { @@ -27,4 +27,4 @@ describe('Lemonldap::NG Manager', function() { }); }); }); -}); \ No newline at end of file +}); diff --git a/e2e-tests/manager/05-form.js b/e2e-tests/manager/05-form.js index 62520db07..1cd83c9d2 100644 --- a/e2e-tests/manager/05-form.js +++ b/e2e-tests/manager/05-form.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('05 Lemonldap::NG Manager', function() { describe('Form control', function() { @@ -87,9 +87,9 @@ describe('Lemonldap::NG Manager', function() { } }); }); - expect(element(by.id('t-virtualHosts/test1.example.com/post/n' + id)).getText()).toMatch(/^https?:\/\//); + expect(element(by.id('t-virtualHosts/test1.example.com/post/n' + id)).getText()).toMatch(/^https?:\/\ //); id++; } }); }); -}); \ No newline at end of file +}); diff --git a/e2e-tests/manager/06-form.js b/e2e-tests/manager/06-form.js index 39c1f6945..96e7524eb 100644 --- a/e2e-tests/manager/06-form.js +++ b/e2e-tests/manager/06-form.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('06 Lemonldap::NG Manager', function() { describe('Form control, part 2', function() { @@ -17,4 +17,4 @@ describe('Lemonldap::NG Manager', function() { expect(skinChoice.count()).toEqual(1); }); }); -}); \ No newline at end of file +}); diff --git a/e2e-tests/manager/07-authParams.js b/e2e-tests/manager/07-authParams.js index adbc1beaa..88737742a 100644 --- a/e2e-tests/manager/07-authParams.js +++ b/e2e-tests/manager/07-authParams.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('07 Lemonldap::NG Manager', function() { describe('Form control, part 3 - authParams', function() { diff --git a/e2e-tests/manager/07-utf8.js b/e2e-tests/manager/07-utf8.js index 305dec6be..35b5e361b 100644 --- a/e2e-tests/manager/07-utf8.js +++ b/e2e-tests/manager/07-utf8.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('07u Lemonldap::NG Manager', function() { describe('Apply mechanism', function() { diff --git a/e2e-tests/manager/08-apply.js b/e2e-tests/manager/08-apply.js index 0aab97b01..bcd2e82c0 100644 --- a/e2e-tests/manager/08-apply.js +++ b/e2e-tests/manager/08-apply.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('08 Lemonldap::NG Manager', function() { describe('Apply mechanism', function() { diff --git a/e2e-tests/manager/10-saml-config.js b/e2e-tests/manager/10-saml-config.js index 0b620ea82..4a9cc55b3 100644 --- a/e2e-tests/manager/10-saml-config.js +++ b/e2e-tests/manager/10-saml-config.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('10 Lemonldap::NG Manager', function() { describe('SAML configuration', function() { @@ -59,4 +59,4 @@ describe('Lemonldap::NG Manager', function() { expect(element(by.id('cfgnum')).getText()).toEqual('4'); }); }); -}); +}); \ No newline at end of file diff --git a/e2e-tests/manager/11-oidcop-config.js b/e2e-tests/manager/11-oidcop-config.js index 6b09c7577..aa2c6d94e 100644 --- a/e2e-tests/manager/11-oidcop-config.js +++ b/e2e-tests/manager/11-oidcop-config.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('11 Lemonldap::NG Manager', function() { describe('OIDC OP configuration', function() { @@ -19,7 +19,7 @@ describe('Lemonldap::NG Manager', function() { element(by.id('filetext')).sendKeys('{"c":"d"}'); element(by.id('t-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars')).click(); element(by.css('.glyphicon-plus-sign')).click(); - element(by.id('a-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars')).click(); + //element(by.id('a-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars')).click(); element(by.id('t-oidcOPMetaDataNodes/new__op-example/oidcOPMetaDataExportedVars/n1')).click(); element(by.id('hashkeyinput')).clear().sendKeys('MyKey'); element(by.id('hashvalueinput')).clear().sendKeys('MyValue'); diff --git a/e2e-tests/manager/12-oidcrp-config.js b/e2e-tests/manager/12-oidcrp-config.js index 50fe45e86..7d284e90e 100644 --- a/e2e-tests/manager/12-oidcrp-config.js +++ b/e2e-tests/manager/12-oidcrp-config.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('12 Lemonldap::NG Manager', function() { describe('OIDC RP configuration', function() { @@ -15,7 +15,7 @@ describe('Lemonldap::NG Manager', function() { element(by.id('a-oidcRPMetaDataNodes/new__rp-example')).click(); element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars')).click(); element(by.css('.glyphicon-plus-sign')).click(); - element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars')).click(); + //element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars')).click(); element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataExportedVars/n1')).click(); element(by.id('hashkeyinput')).clear().sendKeys('MyKey'); element(by.id('hashvalueinput')).clear().sendKeys('MyValue'); @@ -25,7 +25,7 @@ describe('Lemonldap::NG Manager', function() { element(by.id('textinput')).clear().sendKeys('MyClientID'); element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click(); element(by.css('.glyphicon-plus-sign')).click(); - element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click(); + //element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click(); element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims/n2')).click(); element(by.id('hashkeyinput')).clear().sendKeys('MyClaim'); element(by.id('hashvalueinput')).clear().sendKeys('MyAttribute'); diff --git a/e2e-tests/manager/35-apply-old-conf.js b/e2e-tests/manager/35-apply-old-conf.js index e892140b2..9b2cd4bd0 100644 --- a/e2e-tests/manager/35-apply-old-conf.js +++ b/e2e-tests/manager/35-apply-old-conf.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('35 Lemonldap::NG Manager', function() { it('should be able to restore an old configuration', function() { browser.get('/#/confs/1'); diff --git a/e2e-tests/manager/36-diff.js b/e2e-tests/manager/36-diff.js index 7aca5827c..f30967800 100644 --- a/e2e-tests/manager/36-diff.js +++ b/e2e-tests/manager/36-diff.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG Manager', function() { +describe('36 Lemonldap::NG Manager', function() { describe('Diff interface', function() { diff --git a/e2e-tests/manager/40-sessions.js b/e2e-tests/manager/40-sessions.js index 393be452f..c2a846280 100644 --- a/e2e-tests/manager/40-sessions.js +++ b/e2e-tests/manager/40-sessions.js @@ -1,6 +1,6 @@ 'use strict'; -describe('Lemonldap::NG Manager', function() { +describe('40 Lemonldap::NG Manager', function() { it('should display other modules', function() { browser.get('/'); @@ -11,7 +11,7 @@ describe('Lemonldap::NG Manager', function() { }); -describe('Lemonldap::NG Session explorer', function() { +describe('40 Lemonldap::NG Session explorer', function() { var session, ip; @@ -50,4 +50,4 @@ describe('Lemonldap::NG Session explorer', function() { expect(t.count()).toBeGreaterThan(0); }); -}); \ No newline at end of file +}); diff --git a/e2e-tests/manager/99-logout.js b/e2e-tests/manager/99-logout.js index de2a13b4c..5b8841685 100644 --- a/e2e-tests/manager/99-logout.js +++ b/e2e-tests/manager/99-logout.js @@ -2,7 +2,7 @@ /* http://docs.angularjs.org/guide/dev_guide.e2e-testing */ -describe('Lemonldap::NG auth mechanism', function() { +describe('99 Lemonldap::NG auth mechanism', function() { it('should allow logout', function() { browser.driver.get('http://auth.example.com:' + process.env.TESTWEBSERVERPORT + '/?logout=1');