Fixing transferProject e2e tests

stable
Alejandro Alonso 2017-02-24 10:15:00 +01:00
parent aaf90fbf42
commit 7a00f04f4a
2 changed files with 12 additions and 9 deletions

View File

@ -8,8 +8,9 @@ chai.use(chaiAsPromised);
var expect = chai.expect; var expect = chai.expect;
describe('transfer project', () => { describe('transfer project', () => {
let projectSlug = '';
before(async () => { before(async () => {
await utils.common.createProject(['user5@taigaio.demo']); projectSlug = await utils.common.createProject(['user5@taigaio.demo']);
await utils.nav await utils.nav
.init() .init()
@ -22,7 +23,7 @@ describe('transfer project', () => {
await lb.waitOpen(); await lb.waitOpen();
lb.search('Alicia Flores'); lb.search('Angela Perez');
lb.select(0); lb.select(0);
lb.addComment('text'); lb.addComment('text');
@ -41,9 +42,9 @@ describe('transfer project', () => {
}); });
it('reject', async () => { it('reject', async () => {
let token = await utils.common.getTransferProjectToken('admin-aaa', 'user5'); let token = await utils.common.getTransferProjectToken(projectSlug, 'user5');
browser.get(browser.params.glob.host + 'project/admin-aaa/transfer/' + token); browser.get(browser.params.glob.host + 'project/'+ projectSlug +'/transfer/' + token);
await utils.common.waitLoader(); await utils.common.waitLoader();
@ -57,9 +58,9 @@ describe('transfer project', () => {
}); });
it('accept', async () => { it('accept', async () => {
let token = await utils.common.getTransferProjectToken('admin-aaa', 'user5'); let token = await utils.common.getTransferProjectToken(projectSlug, 'user5');
browser.get(browser.params.glob.host + 'project/admin-aaa/transfer/' + token); browser.get(browser.params.glob.host + 'project/' + projectSlug + '/transfer/' + token);
await utils.common.waitLoader(); await utils.common.waitLoader();
@ -78,9 +79,9 @@ describe('transfer project', () => {
max_memberships_public_projects: 0 max_memberships_public_projects: 0
}); });
let token = await utils.common.getTransferProjectToken('admin-aaa', 'user5'); let token = await utils.common.getTransferProjectToken(projectSlug, 'user5');
browser.get(browser.params.glob.host + 'project/admin-aaa/transfer/' + token); browser.get(browser.params.glob.host + 'project/'+ projectSlug +'/transfer/' + token);
await utils.common.waitLoader(); await utils.common.waitLoader();

View File

@ -491,7 +491,8 @@ common.createProject = async function(members = []) {
let projectDescription = 'description ' + Date.now(); let projectDescription = 'description ' + Date.now();
await newProjectScreen.fillNameAndDescription(projectName, projectDescription); await newProjectScreen.fillNameAndDescription(projectName, projectDescription);
await newProjectScreen.createProject(); await newProjectScreen.createProject();
let url = await browser.getCurrentUrl(); let projectUrl = await browser.getCurrentUrl()
let projectSlug = projectUrl.split('/')[4];
if (members.length) { if (members.length) {
var adminMembershipsHelper = require('../helpers').adminMemberships; var adminMembershipsHelper = require('../helpers').adminMemberships;
@ -517,6 +518,7 @@ common.createProject = async function(members = []) {
await newMemberLightbox.waitClose(); await newMemberLightbox.waitClose();
} }
return projectSlug;
}; };
common.getTransferProjectToken = function(projectSlug, username) { common.getTransferProjectToken = function(projectSlug, username) {