diff --git a/e2e/full/kanban.e2e.js b/e2e/full/kanban.e2e.js index 3e9d0fbe..150c2878 100644 --- a/e2e/full/kanban.e2e.js +++ b/e2e/full/kanban.e2e.js @@ -1,6 +1,7 @@ var utils = require('../utils'); var kanbanHelper = require('../helpers').kanban; var backlogHelper = require('../helpers').backlog; +var commonHelper = require('../helpers').common; var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); @@ -275,5 +276,21 @@ describe('kanban', function() { }); }); - it.skip('edit assigned to', function() {}); + it('edit assigned to', async function() { + await kanbanHelper.openWatchers(0, 0); + + let lightbox = commonHelper.assignToLightbox(); + + await lightbox.waitOpen(); + + let assgnedToName = await lightbox.getName(0); + + lightbox.selectFirst(); + + await lightbox.waitClose(); + + let usAssignedTo = await kanbanHelper.getBoxUss(0).get(0).$('.task-assigned').getText(); + + expect(assgnedToName).to.be.equal(usAssignedTo); + }); }); diff --git a/e2e/full/taskboard.e2e.js b/e2e/full/taskboard.e2e.js index c1a2ffe6..c7788bdc 100644 --- a/e2e/full/taskboard.e2e.js +++ b/e2e/full/taskboard.e2e.js @@ -1,6 +1,7 @@ var utils = require('../utils'); var backlogHelper = require('../helpers').backlog; var taskboardHelper = require('../helpers').taskboard; +var commonHelper = require('../helpers').common; var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); @@ -254,7 +255,23 @@ describe('taskboard', function() { }); - it.skip('Change task assigned to', function(){}); + it('Change task assigned to', async function(){ + await taskboardHelper.openWatchers(0, 0, 0); + + let lightbox = commonHelper.assignToLightbox(); + + await lightbox.waitOpen(); + + let assgnedToName = await lightbox.getName(0); + + lightbox.selectFirst(); + + await lightbox.waitClose(); + + let usAssignedTo = await taskboardHelper.getBoxTasks(0, 0).get(0).$('.task-assigned').getText(); + + expect(assgnedToName).to.be.equal(usAssignedTo); + }); describe('Graph', function(){ let graph = $('.graphics-container'); diff --git a/e2e/helpers/common-helper.js b/e2e/helpers/common-helper.js new file mode 100644 index 00000000..edffe368 --- /dev/null +++ b/e2e/helpers/common-helper.js @@ -0,0 +1,24 @@ +var utils = require('../utils'); +var helper = module.exports; + +helper.assignToLightbox = function() { + let el = $('div[tg-lb-assignedto]'); + + let obj = { + el: el, + waitOpen: function() { + return utils.lightbox.open(el); + }, + waitClose: function() { + return utils.lightbox.close(el); + }, + selectFirst: function() { + el.$$('div[data-user-id]').first().click(); + }, + getName: function(item) { + return el.$$('div[data-user-id]').get(item).$('.watcher-name').getText(); + } + }; + + return obj; +}; diff --git a/e2e/helpers/detail-helper.js b/e2e/helpers/detail-helper.js index 1fddb161..0b342208 100644 --- a/e2e/helpers/detail-helper.js +++ b/e2e/helpers/detail-helper.js @@ -138,26 +138,6 @@ helper.assignedTo = function() { return obj; }; -helper.assignToLightbox = function() { - let el = $('div[tg-lb-assignedto]'); - - let obj = { - el: el, - waitOpen: function() { - return utils.lightbox.open(el); - }, - waitClose: function() { - return utils.lightbox.close(el); - }, - selectFirst: function() { - el.$$('div[data-user-id]').first().click(); - } - - }; - - return obj; -}; - helper.history = function() { let el = $('section.history'); let obj = { diff --git a/e2e/helpers/index.js b/e2e/helpers/index.js index 5cddd93f..f62771bd 100644 --- a/e2e/helpers/index.js +++ b/e2e/helpers/index.js @@ -7,3 +7,4 @@ module.exports.detail = require("./detail-helper"); module.exports.usDetail = require("./us-detail-helper"); module.exports.taskDetail = require("./task-detail-helper"); module.exports.adminAttributes = require("./admin-attributes-helper"); +module.exports.common = require("./common-helper"); diff --git a/e2e/helpers/kanban-helper.js b/e2e/helpers/kanban-helper.js index 3b3b8765..eafb5bb9 100644 --- a/e2e/helpers/kanban-helper.js +++ b/e2e/helpers/kanban-helper.js @@ -57,3 +57,7 @@ helper.unFoldCards = function(column) { helper.scrollRight = function() { return browser.executeScript('$(".kanban-table-body:last").scrollLeft(10000);'); }; + +helper.openWatchers = function(column, index) { + return helper.getBoxUss(column).get(index).$('.task-assigned').click(); +}; diff --git a/e2e/helpers/taskboard-helper.js b/e2e/helpers/taskboard-helper.js index 5f033141..34baf865 100644 --- a/e2e/helpers/taskboard-helper.js +++ b/e2e/helpers/taskboard-helper.js @@ -112,3 +112,7 @@ helper.getBulkCreateTask = function() { return obj; }; + +helper.openWatchers = function(row, column, index) { + return helper.getBoxTasks(row, column).get(index).$('.task-assigned').click(); +}; diff --git a/e2e/utils/detail.js b/e2e/utils/detail.js index 561845a0..6752e547 100644 --- a/e2e/utils/detail.js +++ b/e2e/utils/detail.js @@ -1,5 +1,6 @@ var path = require('path'); var detailHelper = require('../helpers').detail; +var commonHelper = require('../helpers').common; var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); @@ -68,7 +69,7 @@ helper.statusTesting = async function() { helper.assignedToTesting = async function() { let assignedTo = detailHelper.assignedTo(); - let assignToLightbox = detailHelper.assignToLightbox(); + let assignToLightbox = commonHelper.assignToLightbox(); let userName = detailHelper.assignedTo().getUserName(); await assignedTo.clear(); assignedTo.assign();