dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use "id" to avoid some errors when tests are chaining

Browse Source
This commit is contained in:
Xavier Guimard 2015-12-22 10:45:29 +00:00
parent c25ef5102c
commit b98b203ec6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e-tests/manager/10-saml-config.js
View File

@ -23,10 +23,10 @@ describe('Lemonldap::NG Manager', function() {
element(by.id('a-samlServiceSecurity')).click()
element(by.id('t-samlServiceSecuritySig')).click()
element(by.css('.glyphicon-plus-sign')).click();
element(by.xpath("//button[@trspan='ok']")).click();
element(by.id('passwordok')).click();
element(by.id('t-samlServiceSecurityEnc')).click()
element(by.css('.glyphicon-plus-sign')).click();
element(by.xpath("//button[@trspan='ok']")).click();
element(by.id('passwordok')).click();
element(by.id('a-samlOrganization')).click();
element(by.id('t-samlOrganizationDisplayName')).click();
element(by.id('textinput')).clear().sendKeys('Org1');
@ -36,7 +36,7 @@ describe('Lemonldap::NG Manager', function() {
it('should save new configuration', function() {
element(by.id('save')).click();
element(by.id('longtextinput')).sendKeys('Activate SAML');
element(by.xpath("//button[@trspan='ok']")).click();
element(by.id('saveok')).click();
expect(element(by.id('cfgnum')).getText()).toEqual('2');
});
});

6
lemonldap-ng-manager/site/templates/manager.tpl
View File

@ -93,7 +93,7 @@
</ul>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()" trspan="ok"></button>
<button class="btn btn-primary" id="nessageok" ng-click="ok()" trspan="ok"></button>
<button class="btn btn-warning" ng-click="cancel()" ng-if="elem('message').displayCancel" trspan="cancel"></button>
</div>
</script>
@ -117,7 +117,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()" trspan="ok"></button>
<button class="btn btn-primary" id="passwordok" ng-click="ok()" trspan="ok"></button>
<button class="btn btn-warning" ng-click="cancel()" trspan="cancel"></button>
</div>
</script>
@ -134,7 +134,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()" trspan="ok"></button>
<button class="btn btn-primary" id="saveok" ng-click="ok()" trspan="ok"></button>
<button class="btn btn-warning" ng-click="cancel()" trspan="cancel"></button>
</div>
</script>