Update E2E perform-wizard test for #2039

globaleaks · Aug 17, 2017 · 9940b69 · 9940b69
1 parent cda0993
commit 9940b69
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/client/app/js/controllers/wizard.js b/client/app/js/controllers/wizard.js
@@ -28,25 +28,25 @@ GLClient.controller('WizardCtrl', ['$scope', '$location', '$route', '$http', 'Au
 
  $scope.config_profiles = [
  {
- name: 'default',
- title:  'Use default settings',
- active: true,
+ active: true,
+ name: 'default',
+ title: 'Use default settings',
  },
  {
- name:  'journos',
- title:  'Investigative journalism',
+ name: 'journo',
+ title: 'Investigative journalism',
  },
  {
- name:  'transparency',
- title:  'NGO anticorruption reporting',
+ name: 'transparency',
+ title: 'NGO anticorruption reporting',
  },
  {
- name:  'public',
- title:  'Public administration compliant whistleblowing',
+ name: 'public',
+ title: 'Public administration compliant whistleblowing',
  },
  {
- name:  'corporate',
- title:  'Internal corporate fraud reporting',
+ name: 'corporate',
+ title: 'Internal corporate fraud reporting',
  },
  ];
 

diff --git a/client/tests/end2end/test-admin-perform-wizard.js b/client/tests/end2end/test-admin-perform-wizard.js
@@ -15,24 +15,28 @@ describe('globaLeaks setup wizard', function() {
 
  element.all(by.id('ButtonNext')).get(1).click();
 
+ element(by.id('profile-1')).click();
+
+ element.all(by.id('ButtonNext')).get(2).click();
+
  element(by.model('wizard.admin.mail_address')).sendKeys('globaleaks-admin@mailinator.com');
  element(by.model('wizard.admin.password')).sendKeys(browser.gl.utils.vars['user_password']);
  element(by.model('admin_check_password')).sendKeys(browser.gl.utils.vars['user_password']);
 
- element.all(by.id('ButtonNext')).get(2).click();
+ element.all(by.id('ButtonNext')).get(3).click();
 
  element(by.model('wizard.context.name')).sendKeys('Context 1');
 
- element.all(by.id('ButtonNext')).get(3).click();
+ element.all(by.id('ButtonNext')).get(4).click();
 
  element(by.model('wizard.receiver.name')).sendKeys('Recipient1');
  element(by.model('wizard.receiver.mail_address')).sendKeys('globaleaks-receiver1@mailinator.com');
 
- element.all(by.id('ButtonNext')).get(4).click();
+ element.all(by.id('ButtonNext')).get(5).click();
 
  expect(element(by.css('.congratulations')).isPresent()).toBe(true);
 
- element.all(by.id('ButtonNext')).get(5).click();
+ element.all(by.id('ButtonNext')).get(6).click();
 
  browser.gl.utils.waitForUrl('/admin/home');
  });