fix user story e2e

e2e/helpers/us-detail-helper.js

@@ -43,32 +43,30 @@ helper.clientRequirement = function() {
     return obj;
 };
 
-helper.relatedTaskForm = function(form, name, status, assigned_to) {
+helper.relatedTaskForm = async function(form, name, status, assigned_to) {
    form.$('input').sendKeys(name);
 
     let taskStatus = form.$('.task-status');
 
-    utils.popover.open(taskStatus, status);
+    await utils.popover.open(taskStatus, status);
 
     form.$('.task-assignedto').click();
 
     let assignToLightbox = commonHelper.assignToLightbox();
 
-    assignToLightbox.waitOpen();
+    await assignToLightbox.waitOpen();
-
+    await assignToLightbox.selectFirst();
-    assignToLightbox.selectFirst();
+    await assignToLightbox.waitClose();
-
-    assignToLightbox.waitClose();
 
     form.$('.icon-floppy').click();
 };
 
 helper.createRelatedTasks = function(name, status, assigned_to) {
-    $$('.related-tasks-buttons').get(0).click();
+    $('section[tg-related-tasks] .add-button').click();
 
     let form = $('.related-task-create-form');
 
-    helper.relatedTaskForm(form, status, assigned_to);
+    return helper.relatedTaskForm(form, status, assigned_to);
 };
 
 helper.editRelatedTasks = function(taskIndex, name, status, assigned_to) {
@@ -76,7 +74,11 @@ helper.editRelatedTasks = function(taskIndex, name, status, assigned_to) {
 
     task.$('.icon-edit').click();
 
-    helper.relatedTaskForm(task, status, assigned_to);
+    return helper.relatedTaskForm(task, status, assigned_to);
+};
+
+helper.editRelatedTasksEnabled = function() {
+    return $$('related-task-create-form.active');
 };
 
 helper.deleteRelatedTask = function(taskIndex, name, status, assigned_to) {
@@ -88,7 +90,7 @@ helper.deleteRelatedTask = function(taskIndex, name, status, assigned_to) {
         .click()
         .perform();
 
-    utils.lightbox.confirm.ok();
+    return utils.lightbox.confirm.ok();
 };
 
 helper.relatedTasks = function() {

e2e/shared/detail.js

@@ -58,22 +58,20 @@ shared.descriptionTesting = async function() {
     await notifications.success.close();
 }
 
-shared.statusTesting = async function() {
+shared.statusTesting = async function(status1 , status2) {
     let statusHelper = detailHelper.statusSelector();
 
     // Status 1
     await statusHelper.setStatus(1);
 
     let selectedStatus = await statusHelper.getSelectedStatus();
-    expect(selectedStatus).to.be.equal('In progress');
+    expect(selectedStatus).to.be.equal(status1);
 
     // Status 2
     await statusHelper.setStatus(2);
 
     let newSelectedStatus = await statusHelper.getSelectedStatus();
-    expect(newSelectedStatus).to.be.equal('Ready for test');
+    expect(newSelectedStatus).to.be.equal(status2);
-
-    await notifications.success.close();
 }
 
 shared.assignedToTesting = function() {

e2e/suites/issues/issue-detail.e2e.js

@@ -31,7 +31,7 @@ describe('Issue detail', async function(){
 
     it('description edition', sharedDetail.descriptionTesting);
 
-    it('status edition', sharedDetail.statusTesting);
+    it('status edition', sharedDetail.statusTesting.bind(this, 'In progress', 'Ready for test'));
 
     describe('assigned to edition', sharedDetail.assignedToTesting);
 

e2e/suites/user-stories/user-story-detail.e2e.js

@@ -32,7 +32,7 @@ describe('User story detail', function(){
 
     it('description edition', sharedDetail.descriptionTesting);
 
-    it('status edition', sharedDetail.statusTesting);
+    it('status edition', sharedDetail.statusTesting.bind(this, 'Ready', 'In progress'));
 
     describe('assigned to edition', sharedDetail.assignedToTesting);
 
@@ -80,33 +80,25 @@ describe('User story detail', function(){
         it('create', async function() {
             let oldRelatedTaskCount = await usDetailHelper.relatedTasks().count();
 
-            usDetailHelper.createRelatedTasks('test', 1, 1);
+            await usDetailHelper.createRelatedTasks('test', 1, 1);
 
-            expect(utils.notifications.success.open()).to.be.eventually.true;
+            let relatedTaskCount = await usDetailHelper.relatedTasks().count();
 
-            utils.notifications.success.close();
+            expect(relatedTaskCount).to.be.equal(oldRelatedTaskCount + 1);
-
-            let relatedTaskCount = usDetailHelper.relatedTasks().count();
-
-            expect(relatedTaskCount).to.be.eventually.equal(oldRelatedTaskCount + 1);
         });
 
-        it('edit', function() {
+        it('edit', async function() {
-            usDetailHelper.editRelatedTasks(0, 'test2', 2, 2);
+            await usDetailHelper.editRelatedTasks(0, 'test2', 2, 2);
 
-            expect(utils.notifications.success.open()).to.be.eventually.true;
+            let count = await usDetailHelper.editRelatedTasksEnabled();
 
-            utils.notifications.success.close();
+            expect(count).to.be.equal.false;
         });
 
         it('delete', async function() {
             let oldRelatedTaskCount = await usDetailHelper.relatedTasks().count();
 
-            usDetailHelper.deleteRelatedTask(0);
+            await usDetailHelper.deleteRelatedTask(0);
-
-            expect(utils.notifications.success.open()).to.be.eventually.true;
-
-            utils.notifications.success.close();
 
             let relatedTaskCount = usDetailHelper.relatedTasks().count();