taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve dragging...or not

stable
Juanfran 2015-08-05 15:29:32 +02:00
parent d192a6ab03
commit d4cbb53102
2 changed files with 64 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
e2e/full/backlog.e2e.js
View File

@ -188,11 +188,13 @@ describe('backlog', function() {
it('drag backlog us', async function() { it('drag backlog us', async function() {
let dragableElements = backlogHelper.userStories(); let dragableElements = backlogHelper.userStories();
let dragElement = dragableElements.get(1); let dragElement = dragableElements.get(1);
let dragElementHandler = dragElement.$('.icon-drag-v');
let draggedElementRef = await backlogHelper.getUsRef(dragElement); let draggedElementRef = await backlogHelper.getUsRef(dragElement);
await utils.common.drag(dragElement, dragableElements.get(0)); await utils.common.drag(dragElementHandler, dragableElements.get(0));
await browser.waitForAngular(); await browser.waitForAngular();
let firstElementTextRef = await backlogHelper.getUsRef(dragableElements.get(0)); let firstElementTextRef = await backlogHelper.getUsRef(dragableElements.get(0));
@ -200,7 +202,7 @@ describe('backlog', function() {
expect(firstElementTextRef).to.be.equal(draggedElementRef); expect(firstElementTextRef).to.be.equal(draggedElementRef);
}); });
utils.common.browserSkip('firefox', 'reorder multiple us', async function() { it('reorder multiple us', async function() {
let dragableElements = backlogHelper.userStories(); let dragableElements = backlogHelper.userStories();
let count = await dragableElements.count(); let count = await dragableElements.count();
@ -209,17 +211,18 @@ describe('backlog', function() {
//element 1 //element 1
let dragElement = dragableElements.get(count - 1); let dragElement = dragableElements.get(count - 1);
let dragElementHandler = dragElement.$('.icon-drag-v');
dragElement.$('input[type="checkbox"]').click(); dragElement.$('input[type="checkbox"]').click();
let ref1 = await backlogHelper.getUsRef(dragElement);
draggedRefs.push(await backlogHelper.getUsRef(dragElement)); draggedRefs.push(await backlogHelper.getUsRef(dragElement));
//element 2 //element 2
dragElement = dragableElements.get(count - 2); dragElement = dragableElements.get(count - 2);
dragElement.$('input[type="checkbox"]').click(); dragElement.$('input[type="checkbox"]').click();
let ref2 = await backlogHelper.getUsRef(dragElement);
draggedRefs.push(await backlogHelper.getUsRef(dragElement)); draggedRefs.push(await backlogHelper.getUsRef(dragElement));
await utils.common.drag(dragElementHandler, dragableElements.get(0)); await utils.common.drag(dragElement, dragableElements.get(0));
await browser.waitForAngular(); await browser.sleep(200);
let elementRef1 = await backlogHelper.getUsRef(dragableElements.get(0)); let elementRef1 = await backlogHelper.getUsRef(dragableElements.get(0));
let elementRef2 = await backlogHelper.getUsRef(dragableElements.get(1)); let elementRef2 = await backlogHelper.getUsRef(dragableElements.get(1));
@ -228,51 +231,44 @@ describe('backlog', function() {
expect(elementRef1).to.be.equal(draggedRefs[1]); expect(elementRef1).to.be.equal(draggedRefs[1]);
}); });
utils.common.browserSkip('firefox', 'drag us to milestone', async function() { it('drag multiple us to milestone', async function() {
let sprint = backlogHelper.sprints().get(1); let sprint = backlogHelper.sprints().get(0);
let initUssSprintCount = await backlogHelper.getSprintUsertories(sprint).count();
let dragableElements = backlogHelper.userStories();
let dragElement = dragableElements.get(0);
let draggedElementRef = await backlogHelper.getUsRef(dragElement);
await utils.common.drag(dragElement, sprint);
await browser.waitForAngular();
let firstElementSprint = await backlogHelper.getSprintUsertories(sprint).first();
let firstElementSprintRef = await backlogHelper.getUsRef(firstElementSprint);
expect(draggedElementRef).to.be.equal(firstElementSprintRef);
});
utils.common.browserSkip('firefox', 'drag multiple us to milestone', async function() {
let sprint = backlogHelper.sprints().get(1);
let dragableElements = backlogHelper.userStories(); let dragableElements = backlogHelper.userStories();
let draggedRefs = []; let draggedRefs = [];
//elefirment 1 // the us 1 and 2 are selected on the previous test
let dragElement = dragableElements.get(0); let dragElement = dragableElements.get(0);
dragElement.$('input[type="checkbox"]').click(); let dragElementHandler = dragElement.$('.icon-drag-v');
draggedRefs.push(await backlogHelper.getUsRef(dragElement));
//element 2 await utils.common.drag(dragElementHandler, sprint);
dragElement = dragableElements.get(1);
dragElement.$('input[type="checkbox"]').click();
draggedRefs.push(await backlogHelper.getUsRef(dragElement));
await utils.common.drag(dragElement, sprint);
await browser.waitForAngular(); await browser.waitForAngular();
let elementSprint1 = await backlogHelper.getSprintUsertories(sprint).get(0); let ussSprintCount = await backlogHelper.getSprintUsertories(sprint).count();
let elementSprintRef1 = await backlogHelper.getUsRef(elementSprint1);
let elementSprint2 = await backlogHelper.getSprintUsertories(sprint).get(1); expect(ussSprintCount).to.be.equal(initUssSprintCount + 2);
let elementSprintRef2 = await backlogHelper.getUsRef(elementSprint2); });
expect(elementSprintRef1).to.be.equal(draggedRefs[0]); it('drag us to milestone', async function() {
expect(elementSprintRef2).to.be.equal(draggedRefs[1]); let sprint = backlogHelper.sprints().get(0);
let dragableElements = backlogHelper.userStories();
let dragElement = dragableElements.get(0);
let dragElementHandler = dragElement.$('.icon-drag-v');
let draggedElementRef = await backlogHelper.getUsRef(dragElement);
let initUssSprintCount = await backlogHelper.getSprintUsertories(sprint).count();
await utils.common.drag(dragElementHandler, sprint);
await browser.waitForAngular();
let ussSprintCount = await backlogHelper.getSprintUsertories(sprint).count();
expect(ussSprintCount).to.be.equal(initUssSprintCount + 1);
}); });
it('move to current sprint button', async function() { it('move to current sprint button', async function() {
@ -312,16 +308,18 @@ describe('backlog', function() {
let sprint1 = backlogHelper.sprints().get(0); let sprint1 = backlogHelper.sprints().get(0);
let sprint2 = backlogHelper.sprints().get(1); let sprint2 = backlogHelper.sprints().get(1);
let initUssSprintCount = await backlogHelper.getSprintUsertories(sprint2).count();
let dragElement = backlogHelper.getSprintUsertories(sprint1).get(0); let dragElement = backlogHelper.getSprintUsertories(sprint1).get(0);
let dragElementRef = await backlogHelper.getUsRef(dragElement);
await utils.common.drag(dragElement, sprint2); await utils.common.drag(dragElement, sprint2);
await browser.waitForAngular(); await browser.waitForAngular();
let firstElement = backlogHelper.getSprintUsertories(sprint2).get(0); let firstElement = backlogHelper.getSprintUsertories(sprint2).get(0);
let firstElementRef = await backlogHelper.getUsRef(firstElement);
expect(dragElementRef).to.be.equal(firstElementRef); let ussSprintCount = await backlogHelper.getSprintUsertories(sprint2).count();
expect(ussSprintCount).to.be.equal(initUssSprintCount + 1);
}); });
it('select us with SHIFT', async function() { it('select us with SHIFT', async function() {
@ -515,6 +513,9 @@ describe('backlog', function() {
let htmlChanges = await utils.common.outerHtmlChanges('.backlog-table-body'); let htmlChanges = await utils.common.outerHtmlChanges('.backlog-table-body');
$$('.filters-cats a').get(1).click(); $$('.filters-cats a').get(1).click();
await browser.waitForAngular();
$$('.filter-list a').first().click(); $$('.filter-list a').first().click();
await htmlChanges(); await htmlChanges();

65
e2e/utils/common.js
View File

@ -102,57 +102,34 @@ common.dragEnd = function(elm) {
}; };
common.drag = function(elm, elm2, duration=500) { common.drag = function(elm, elm2, duration=500) {
return new Promise(async function(resolve) { // this code doesn't have sense (jquery ui + scroll drag + selenium = :( )
let init = await elm.getLocation(); await browser.actions()
let dest = await elm2.getLocation(); .mouseMove(elm)
.mouseDown()
.perform();
let startTime = new Date().getTime(); await browser.actions()
let fromX = init.x; .mouseMove(elm2)
let toX = dest.x; .perform();
let fromY = init.y; await browser.sleep(20);
let toY = dest.y;
let deltaX = toX - fromX; await browser.actions()
let deltaY = toY - fromY; .mouseMove({x: 10, y: -10}) // fire jqueryui mousemove event always
.perform();
let lastPos = {x: fromX, y: fromY}; await browser.sleep(20);
browser.actions() await browser.actions()
.mouseMove(elm) .mouseMove(elm2)
.mouseDown() .perform();
.perform();
let interval = setInterval(() => { await browser.sleep(20);
let elapsed = new Date().getTime() - startTime;
let factor = Math.min(elapsed / duration, 1);
let newX = parseInt(fromX + deltaX * factor, 10); return browser.actions()
let newY = parseInt(fromY + deltaY * factor, 10); .mouseUp()
.perform()
let pos = {}; .then(common.dragEnd);
pos.x = newX - lastPos.x;
pos.y = newY - lastPos.y;
lastPos.x = newX;
lastPos.y = newY;
if (lastPos.x === toX && lastPos.y === toY) {
clearInterval(interval);
browser.actions()
.mouseMove(pos)
.mouseUp()
.perform()
.then(common.dragEnd)
.then(resolve);
} else {
browser.actions()
.mouseMove(pos)
.perform();
}
}, 100);
});
}; };
common.transitionend = function(selector, property) { common.transitionend = function(selector, property) {