From cbe286b6dea2df2105ed1a0ad26878ca6cf327e3 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 30 Nov 2015 09:03:05 +0100 Subject: [PATCH 1/2] move tests to e2e/suties --- conf.e2e.js | 31 +++++++++---------- e2e/README.md | 10 ++---- .../admin/attributes/custom-fields.e2e.js | 0 .../admin/attributes/points.e2e.js | 0 .../admin/attributes/priorities.e2e.js | 0 .../admin/attributes/severities.e2e.js | 0 .../admin/attributes/status.e2e.js | 0 .../admin/attributes/types.e2e.js | 0 .../admin/integrations/bitbucket.e2e.js | 0 .../admin/integrations/github.e2e.js | 0 .../admin/integrations/gitlab.e2e.js | 0 .../admin/integrations/webhooks.e2e.js | 0 e2e/{full => suites}/admin/members.e2e.js | 0 e2e/{full => suites}/admin/permissions.e2e.js | 0 .../admin/project/create-delete.e2e.js | 0 .../admin/project/default-values.e2e.js | 0 .../admin/project/modules.e2e.js | 0 .../admin/project/project-detail.e2e.js | 0 .../admin/project/reports.e2e.js | 0 e2e/{ => suites}/auth/auth.e2e.js | 2 +- e2e/{full => suites}/backlog.e2e.js | 0 e2e/{full => suites}/home.e2e.js | 0 .../issues/issue-detail.e2e.js | 0 e2e/{full => suites}/issues/issues.e2e.js | 0 e2e/{full => suites}/kanban.e2e.js | 0 e2e/{full => suites}/project-home.e2e.js | 0 e2e/{ => suites}/public/public.e2e.js | 2 +- e2e/{full => suites}/search.e2e.js | 0 e2e/{full => suites}/tasks/task-detail.e2e.js | 0 e2e/{full => suites}/tasks/taskboard.e2e.js | 0 e2e/{full => suites}/team.e2e.js | 0 .../user-profile/change-password.e2e.js | 0 .../user-profile/edit-user-profile.e2e.js | 0 .../user-profile/email-notification.e2e.js | 0 .../user-profile/feedback.e2e.js | 0 .../user-profile/user-profile-activity.e2e.js | 0 .../user-profile/user-profile-contacts.e2e.js | 0 .../user-profile/user-profile-likes.e2e.js | 0 .../user-profile/user-profile-projects.e2e.js | 0 .../user-profile/user-profile-votes.e2e.js | 0 .../user-profile/user-profile-watched.e2e.js | 0 .../user-stories/user-story-detail.e2e.js | 0 e2e/{full => suites}/wiki.e2e.js | 0 43 files changed, 19 insertions(+), 26 deletions(-) rename e2e/{full => suites}/admin/attributes/custom-fields.e2e.js (100%) rename e2e/{full => suites}/admin/attributes/points.e2e.js (100%) rename e2e/{full => suites}/admin/attributes/priorities.e2e.js (100%) rename e2e/{full => suites}/admin/attributes/severities.e2e.js (100%) rename e2e/{full => suites}/admin/attributes/status.e2e.js (100%) rename e2e/{full => suites}/admin/attributes/types.e2e.js (100%) rename e2e/{full => suites}/admin/integrations/bitbucket.e2e.js (100%) rename e2e/{full => suites}/admin/integrations/github.e2e.js (100%) rename e2e/{full => suites}/admin/integrations/gitlab.e2e.js (100%) rename e2e/{full => suites}/admin/integrations/webhooks.e2e.js (100%) rename e2e/{full => suites}/admin/members.e2e.js (100%) rename e2e/{full => suites}/admin/permissions.e2e.js (100%) rename e2e/{full => suites}/admin/project/create-delete.e2e.js (100%) rename e2e/{full => suites}/admin/project/default-values.e2e.js (100%) rename e2e/{full => suites}/admin/project/modules.e2e.js (100%) rename e2e/{full => suites}/admin/project/project-detail.e2e.js (100%) rename e2e/{full => suites}/admin/project/reports.e2e.js (100%) rename e2e/{ => suites}/auth/auth.e2e.js (99%) rename e2e/{full => suites}/backlog.e2e.js (100%) rename e2e/{full => suites}/home.e2e.js (100%) rename e2e/{full => suites}/issues/issue-detail.e2e.js (100%) rename e2e/{full => suites}/issues/issues.e2e.js (100%) rename e2e/{full => suites}/kanban.e2e.js (100%) rename e2e/{full => suites}/project-home.e2e.js (100%) rename e2e/{ => suites}/public/public.e2e.js (98%) rename e2e/{full => suites}/search.e2e.js (100%) rename e2e/{full => suites}/tasks/task-detail.e2e.js (100%) rename e2e/{full => suites}/tasks/taskboard.e2e.js (100%) rename e2e/{full => suites}/team.e2e.js (100%) rename e2e/{full => suites}/user-profile/change-password.e2e.js (100%) rename e2e/{full => suites}/user-profile/edit-user-profile.e2e.js (100%) rename e2e/{full => suites}/user-profile/email-notification.e2e.js (100%) rename e2e/{full => suites}/user-profile/feedback.e2e.js (100%) rename e2e/{full => suites}/user-profile/user-profile-activity.e2e.js (100%) rename e2e/{full => suites}/user-profile/user-profile-contacts.e2e.js (100%) rename e2e/{full => suites}/user-profile/user-profile-likes.e2e.js (100%) rename e2e/{full => suites}/user-profile/user-profile-projects.e2e.js (100%) rename e2e/{full => suites}/user-profile/user-profile-votes.e2e.js (100%) rename e2e/{full => suites}/user-profile/user-profile-watched.e2e.js (100%) rename e2e/{full => suites}/user-stories/user-story-detail.e2e.js (100%) rename e2e/{full => suites}/wiki.e2e.js (100%) diff --git a/conf.e2e.js b/conf.e2e.js index b974004a..e0b11b37 100644 --- a/conf.e2e.js +++ b/conf.e2e.js @@ -27,20 +27,20 @@ exports.config = { // version: '11' // }, suites: { - auth: "e2e/auth/*.e2e.js", - public: "e2e/public/**/*.e2e.js", - wiki: "e2e/full/wiki.e2e.js", - admin: "e2e/full/admin/**/*.e2e.js", - issues: "e2e/full/issues/*.e2e.js", - tasks: "e2e/full/tasks/*.e2e.js", - userProfile: "e2e/full/user-profile/*.e2e.js", - userStories: "e2e/full/user-stories/*.e2e.js", - backlog: "e2e/full/backlog.e2e.js", - home: "e2e/full/home.e2e.js", - kanban: "e2e/full/kanban.e2e.js", - projectHome: "e2e/full/project-home.e2e.js", - search: "e2e/full/search.e2e.js", - team: "e2e/full/team.e2e.js" + auth: "e2e/suites/auth/*.e2e.js", + public: "e2e/suites/public/**/*.e2e.js", + wiki: "e2e/suites/wiki.e2e.js", + admin: "e2e/suites/admin/**/*.e2e.js", + issues: "e2e/suites/issues/*.e2e.js", + tasks: "e2e/suites/tasks/*.e2e.js", + userProfile: "e2e/suites/user-profile/*.e2e.js", + userStories: "e2e/suites/user-stories/*.e2e.js", + backlog: "e2e/suites/backlog.e2e.js", + home: "e2e/suites/home.e2e.js", + kanban: "e2e/suites/kanban.e2e.js", + projectHome: "e2e/suites/project-home.e2e.js", + search: "e2e/suites/search.e2e.js", + team: "e2e/suites/team.e2e.js" }, onPrepare: function() { // track mouse movements @@ -81,8 +81,7 @@ exports.config = { setTimeout(function() { dotEl.remove(); - }, 1000) - + }, 1000); } $document.on({ diff --git a/e2e/README.md b/e2e/README.md index 04372833..c39d4c9f 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -19,14 +19,8 @@ After taiga-back and taiga-front are running webdriver-manager start ``` -for auth test: +run test: ``` -protractor conf.e2e.js --suite=auth -``` - -For full tests - -``` -protractor conf.e2e.js --suite=full +protractor conf.e2e.js --suite=suiteName ``` diff --git a/e2e/full/admin/attributes/custom-fields.e2e.js b/e2e/suites/admin/attributes/custom-fields.e2e.js similarity index 100% rename from e2e/full/admin/attributes/custom-fields.e2e.js rename to e2e/suites/admin/attributes/custom-fields.e2e.js diff --git a/e2e/full/admin/attributes/points.e2e.js b/e2e/suites/admin/attributes/points.e2e.js similarity index 100% rename from e2e/full/admin/attributes/points.e2e.js rename to e2e/suites/admin/attributes/points.e2e.js diff --git a/e2e/full/admin/attributes/priorities.e2e.js b/e2e/suites/admin/attributes/priorities.e2e.js similarity index 100% rename from e2e/full/admin/attributes/priorities.e2e.js rename to e2e/suites/admin/attributes/priorities.e2e.js diff --git a/e2e/full/admin/attributes/severities.e2e.js b/e2e/suites/admin/attributes/severities.e2e.js similarity index 100% rename from e2e/full/admin/attributes/severities.e2e.js rename to e2e/suites/admin/attributes/severities.e2e.js diff --git a/e2e/full/admin/attributes/status.e2e.js b/e2e/suites/admin/attributes/status.e2e.js similarity index 100% rename from e2e/full/admin/attributes/status.e2e.js rename to e2e/suites/admin/attributes/status.e2e.js diff --git a/e2e/full/admin/attributes/types.e2e.js b/e2e/suites/admin/attributes/types.e2e.js similarity index 100% rename from e2e/full/admin/attributes/types.e2e.js rename to e2e/suites/admin/attributes/types.e2e.js diff --git a/e2e/full/admin/integrations/bitbucket.e2e.js b/e2e/suites/admin/integrations/bitbucket.e2e.js similarity index 100% rename from e2e/full/admin/integrations/bitbucket.e2e.js rename to e2e/suites/admin/integrations/bitbucket.e2e.js diff --git a/e2e/full/admin/integrations/github.e2e.js b/e2e/suites/admin/integrations/github.e2e.js similarity index 100% rename from e2e/full/admin/integrations/github.e2e.js rename to e2e/suites/admin/integrations/github.e2e.js diff --git a/e2e/full/admin/integrations/gitlab.e2e.js b/e2e/suites/admin/integrations/gitlab.e2e.js similarity index 100% rename from e2e/full/admin/integrations/gitlab.e2e.js rename to e2e/suites/admin/integrations/gitlab.e2e.js diff --git a/e2e/full/admin/integrations/webhooks.e2e.js b/e2e/suites/admin/integrations/webhooks.e2e.js similarity index 100% rename from e2e/full/admin/integrations/webhooks.e2e.js rename to e2e/suites/admin/integrations/webhooks.e2e.js diff --git a/e2e/full/admin/members.e2e.js b/e2e/suites/admin/members.e2e.js similarity index 100% rename from e2e/full/admin/members.e2e.js rename to e2e/suites/admin/members.e2e.js diff --git a/e2e/full/admin/permissions.e2e.js b/e2e/suites/admin/permissions.e2e.js similarity index 100% rename from e2e/full/admin/permissions.e2e.js rename to e2e/suites/admin/permissions.e2e.js diff --git a/e2e/full/admin/project/create-delete.e2e.js b/e2e/suites/admin/project/create-delete.e2e.js similarity index 100% rename from e2e/full/admin/project/create-delete.e2e.js rename to e2e/suites/admin/project/create-delete.e2e.js diff --git a/e2e/full/admin/project/default-values.e2e.js b/e2e/suites/admin/project/default-values.e2e.js similarity index 100% rename from e2e/full/admin/project/default-values.e2e.js rename to e2e/suites/admin/project/default-values.e2e.js diff --git a/e2e/full/admin/project/modules.e2e.js b/e2e/suites/admin/project/modules.e2e.js similarity index 100% rename from e2e/full/admin/project/modules.e2e.js rename to e2e/suites/admin/project/modules.e2e.js diff --git a/e2e/full/admin/project/project-detail.e2e.js b/e2e/suites/admin/project/project-detail.e2e.js similarity index 100% rename from e2e/full/admin/project/project-detail.e2e.js rename to e2e/suites/admin/project/project-detail.e2e.js diff --git a/e2e/full/admin/project/reports.e2e.js b/e2e/suites/admin/project/reports.e2e.js similarity index 100% rename from e2e/full/admin/project/reports.e2e.js rename to e2e/suites/admin/project/reports.e2e.js diff --git a/e2e/auth/auth.e2e.js b/e2e/suites/auth/auth.e2e.js similarity index 99% rename from e2e/auth/auth.e2e.js rename to e2e/suites/auth/auth.e2e.js index 6a77adad..f7b7b502 100644 --- a/e2e/auth/auth.e2e.js +++ b/e2e/suites/auth/auth.e2e.js @@ -1,4 +1,4 @@ -var utils = require('../utils'); +var utils = require('../../utils'); var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); diff --git a/e2e/full/backlog.e2e.js b/e2e/suites/backlog.e2e.js similarity index 100% rename from e2e/full/backlog.e2e.js rename to e2e/suites/backlog.e2e.js diff --git a/e2e/full/home.e2e.js b/e2e/suites/home.e2e.js similarity index 100% rename from e2e/full/home.e2e.js rename to e2e/suites/home.e2e.js diff --git a/e2e/full/issues/issue-detail.e2e.js b/e2e/suites/issues/issue-detail.e2e.js similarity index 100% rename from e2e/full/issues/issue-detail.e2e.js rename to e2e/suites/issues/issue-detail.e2e.js diff --git a/e2e/full/issues/issues.e2e.js b/e2e/suites/issues/issues.e2e.js similarity index 100% rename from e2e/full/issues/issues.e2e.js rename to e2e/suites/issues/issues.e2e.js diff --git a/e2e/full/kanban.e2e.js b/e2e/suites/kanban.e2e.js similarity index 100% rename from e2e/full/kanban.e2e.js rename to e2e/suites/kanban.e2e.js diff --git a/e2e/full/project-home.e2e.js b/e2e/suites/project-home.e2e.js similarity index 100% rename from e2e/full/project-home.e2e.js rename to e2e/suites/project-home.e2e.js diff --git a/e2e/public/public.e2e.js b/e2e/suites/public/public.e2e.js similarity index 98% rename from e2e/public/public.e2e.js rename to e2e/suites/public/public.e2e.js index c3c5d16c..bfe04d31 100644 --- a/e2e/public/public.e2e.js +++ b/e2e/suites/public/public.e2e.js @@ -1,4 +1,4 @@ -var utils = require('../utils'); +var utils = require('../../utils'); var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); diff --git a/e2e/full/search.e2e.js b/e2e/suites/search.e2e.js similarity index 100% rename from e2e/full/search.e2e.js rename to e2e/suites/search.e2e.js diff --git a/e2e/full/tasks/task-detail.e2e.js b/e2e/suites/tasks/task-detail.e2e.js similarity index 100% rename from e2e/full/tasks/task-detail.e2e.js rename to e2e/suites/tasks/task-detail.e2e.js diff --git a/e2e/full/tasks/taskboard.e2e.js b/e2e/suites/tasks/taskboard.e2e.js similarity index 100% rename from e2e/full/tasks/taskboard.e2e.js rename to e2e/suites/tasks/taskboard.e2e.js diff --git a/e2e/full/team.e2e.js b/e2e/suites/team.e2e.js similarity index 100% rename from e2e/full/team.e2e.js rename to e2e/suites/team.e2e.js diff --git a/e2e/full/user-profile/change-password.e2e.js b/e2e/suites/user-profile/change-password.e2e.js similarity index 100% rename from e2e/full/user-profile/change-password.e2e.js rename to e2e/suites/user-profile/change-password.e2e.js diff --git a/e2e/full/user-profile/edit-user-profile.e2e.js b/e2e/suites/user-profile/edit-user-profile.e2e.js similarity index 100% rename from e2e/full/user-profile/edit-user-profile.e2e.js rename to e2e/suites/user-profile/edit-user-profile.e2e.js diff --git a/e2e/full/user-profile/email-notification.e2e.js b/e2e/suites/user-profile/email-notification.e2e.js similarity index 100% rename from e2e/full/user-profile/email-notification.e2e.js rename to e2e/suites/user-profile/email-notification.e2e.js diff --git a/e2e/full/user-profile/feedback.e2e.js b/e2e/suites/user-profile/feedback.e2e.js similarity index 100% rename from e2e/full/user-profile/feedback.e2e.js rename to e2e/suites/user-profile/feedback.e2e.js diff --git a/e2e/full/user-profile/user-profile-activity.e2e.js b/e2e/suites/user-profile/user-profile-activity.e2e.js similarity index 100% rename from e2e/full/user-profile/user-profile-activity.e2e.js rename to e2e/suites/user-profile/user-profile-activity.e2e.js diff --git a/e2e/full/user-profile/user-profile-contacts.e2e.js b/e2e/suites/user-profile/user-profile-contacts.e2e.js similarity index 100% rename from e2e/full/user-profile/user-profile-contacts.e2e.js rename to e2e/suites/user-profile/user-profile-contacts.e2e.js diff --git a/e2e/full/user-profile/user-profile-likes.e2e.js b/e2e/suites/user-profile/user-profile-likes.e2e.js similarity index 100% rename from e2e/full/user-profile/user-profile-likes.e2e.js rename to e2e/suites/user-profile/user-profile-likes.e2e.js diff --git a/e2e/full/user-profile/user-profile-projects.e2e.js b/e2e/suites/user-profile/user-profile-projects.e2e.js similarity index 100% rename from e2e/full/user-profile/user-profile-projects.e2e.js rename to e2e/suites/user-profile/user-profile-projects.e2e.js diff --git a/e2e/full/user-profile/user-profile-votes.e2e.js b/e2e/suites/user-profile/user-profile-votes.e2e.js similarity index 100% rename from e2e/full/user-profile/user-profile-votes.e2e.js rename to e2e/suites/user-profile/user-profile-votes.e2e.js diff --git a/e2e/full/user-profile/user-profile-watched.e2e.js b/e2e/suites/user-profile/user-profile-watched.e2e.js similarity index 100% rename from e2e/full/user-profile/user-profile-watched.e2e.js rename to e2e/suites/user-profile/user-profile-watched.e2e.js diff --git a/e2e/full/user-stories/user-story-detail.e2e.js b/e2e/suites/user-stories/user-story-detail.e2e.js similarity index 100% rename from e2e/full/user-stories/user-story-detail.e2e.js rename to e2e/suites/user-stories/user-story-detail.e2e.js diff --git a/e2e/full/wiki.e2e.js b/e2e/suites/wiki.e2e.js similarity index 100% rename from e2e/full/wiki.e2e.js rename to e2e/suites/wiki.e2e.js From d3b7d736d1227c9d95e3b59c6d01d77e7339aae6 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 30 Nov 2015 09:53:24 +0100 Subject: [PATCH 2/2] move utils.details to shared --- e2e/{utils => shared}/detail.js | 28 +++++++++---------- e2e/suites/issues/issue-detail.e2e.js | 25 +++++++++-------- e2e/suites/tasks/task-detail.e2e.js | 23 +++++++-------- .../user-stories/user-story-detail.e2e.js | 23 +++++++-------- e2e/suites/wiki.e2e.js | 3 +- e2e/utils/index.js | 1 - 6 files changed, 53 insertions(+), 50 deletions(-) rename e2e/{utils => shared}/detail.js (95%) diff --git a/e2e/utils/detail.js b/e2e/shared/detail.js similarity index 95% rename from e2e/utils/detail.js rename to e2e/shared/detail.js index a05f3d64..1bfeece9 100644 --- a/e2e/utils/detail.js +++ b/e2e/shared/detail.js @@ -2,8 +2,8 @@ var path = require('path'); var detailHelper = require('../helpers').detail; var commonHelper = require('../helpers').common; var customFieldsHelper = require('../helpers/custom-fields-helper'); -var commonUtil = require('./common'); -var notifications = require('./notifications'); +var commonUtil = require('../utils/common'); +var notifications = require('../utils/notifications'); var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); @@ -11,9 +11,9 @@ var chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); var expect = chai.expect; -var helper = module.exports; +var shared = module.exports; -helper.titleTesting = async function() { +shared.titleTesting = async function() { let titleHelper = detailHelper.title(); let title = await titleHelper.getTitle(); let date = Date.now(); @@ -22,7 +22,7 @@ helper.titleTesting = async function() { expect(newTitle).to.be.not.equal(title); } -helper.tagsTesting = async function() { +shared.tagsTesting = async function() { let tagsHelper = detailHelper.tags(); let tagsText = await tagsHelper.getTagsText(); await tagsHelper.clearTags(); @@ -35,7 +35,7 @@ helper.tagsTesting = async function() { expect(newtagsText).to.be.not.eql(tagsText); } -helper.descriptionTesting = async function() { +shared.descriptionTesting = async function() { let descriptionHelper = detailHelper.description(); let description = await descriptionHelper.getInnerHtml(); let date = Date.now(); @@ -46,7 +46,7 @@ helper.descriptionTesting = async function() { expect(newDescription).to.be.not.equal(description); } -helper.statusTesting = async function() { +shared.statusTesting = async function() { let statusHelper = detailHelper.statusSelector(); // Current status @@ -71,7 +71,7 @@ helper.statusTesting = async function() { expect(newGenericStatus).to.be.not.equal(genericStatus); } -helper.assignedToTesting = function() { +shared.assignedToTesting = function() { before(function () { let assignedTo = detailHelper.assignedTo(); return assignedTo.clear(); @@ -156,7 +156,7 @@ helper.assignedToTesting = function() { }); } -helper.historyTesting = async function() { +shared.historyTesting = async function() { let historyHelper = detailHelper.history(); //Adding a comment @@ -188,7 +188,7 @@ helper.historyTesting = async function() { expect(activitiesCounter).to.be.least(newCommentsCounter); } -helper.blockTesting = async function() { +shared.blockTesting = async function() { let blockHelper = detailHelper.block(); let blockLightboxHelper = detailHelper.blockLightbox(); @@ -208,7 +208,7 @@ helper.blockTesting = async function() { expect($('.block-description').isDisplayed()).to.be.eventually.false; } -helper.attachmentTesting = async function() { +shared.attachmentTesting = async function() { let attachmentHelper = detailHelper.attachment(); let date = Date.now(); @@ -256,12 +256,12 @@ helper.attachmentTesting = async function() { expect(newAttachmentsLength).to.be.equal(attachmentsLength - 1); } -helper.deleteTesting = async function() { +shared.deleteTesting = async function() { let deleteHelper = detailHelper.delete(); await deleteHelper.delete(); } -helper.watchersTesting = function() { +shared.watchersTesting = function() { before(function () { let watchersHelper = detailHelper.watchers(); return watchersHelper.removeAllWatchers(); @@ -345,7 +345,7 @@ helper.watchersTesting = function() { }); } -helper.customFields = function(typeIndex) { +shared.customFields = function(typeIndex) { before(async function() { let url = await browser.getCurrentUrl(); diff --git a/e2e/suites/issues/issue-detail.e2e.js b/e2e/suites/issues/issue-detail.e2e.js index 5419b19f..28467ab7 100644 --- a/e2e/suites/issues/issue-detail.e2e.js +++ b/e2e/suites/issues/issue-detail.e2e.js @@ -1,4 +1,5 @@ var utils = require('../../utils'); +var sharedDetail = require('../../shared/detail'); var chai = require('chai'); var chaiAsPromised = require('chai-as-promised'); @@ -6,7 +7,7 @@ var chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); var expect = chai.expect; -describe('Issue detail', async function(){ +describe.only('Issue detail', async function(){ let issueUrl = ''; before(async function(){ @@ -24,32 +25,32 @@ describe('Issue detail', async function(){ await utils.common.takeScreenshot("issues", "detail"); }); - it('title edition', utils.detail.titleTesting); + it('title edition', sharedDetail.titleTesting); - it('tags edition', utils.detail.tagsTesting); + it('tags edition', sharedDetail.tagsTesting); - it('description edition', utils.detail.descriptionTesting); + it('description edition', sharedDetail.descriptionTesting); - it('status edition', utils.detail.statusTesting); + it('status edition', sharedDetail.statusTesting); - describe('assigned to edition', utils.detail.assignedToTesting); + describe('assigned to edition', sharedDetail.assignedToTesting); - describe('watchers edition', utils.detail.watchersTesting); + describe('watchers edition', sharedDetail.watchersTesting); - it('history', utils.detail.historyTesting); + it('history', sharedDetail.historyTesting); - it('block', utils.detail.blockTesting); + it('block', sharedDetail.blockTesting); - it('attachments', utils.detail.attachmentTesting); + it('attachments', sharedDetail.attachmentTesting); - describe('custom-fields', utils.detail.customFields.bind(this, 2)); + describe('custom-fields', sharedDetail.customFields.bind(this, 2)); it('screenshot', async function() { await utils.common.takeScreenshot("issues", "detail updated"); }); describe('delete & redirect', function() { - it('delete', utils.detail.deleteTesting); + it('delete', sharedDetail.deleteTesting); it('redirected', async function (){ let url = await browser.getCurrentUrl(); diff --git a/e2e/suites/tasks/task-detail.e2e.js b/e2e/suites/tasks/task-detail.e2e.js index 8739b1bd..f5907c96 100644 --- a/e2e/suites/tasks/task-detail.e2e.js +++ b/e2e/suites/tasks/task-detail.e2e.js @@ -1,4 +1,5 @@ var utils = require('../../utils'); +var sharedDetail = require('../../shared/detail'); var taskDetailHelper = require('../../helpers').taskDetail; var chai = require('chai'); @@ -26,17 +27,17 @@ describe('Task detail', function(){ await utils.common.takeScreenshot("tasks", "detail"); }); - it('title edition', utils.detail.titleTesting); + it('title edition', sharedDetail.titleTesting); - it('tags edition', utils.detail.tagsTesting); + it('tags edition', sharedDetail.tagsTesting); - it('description edition', utils.detail.descriptionTesting); + it('description edition', sharedDetail.descriptionTesting); - it('status edition', utils.detail.statusTesting); + it('status edition', sharedDetail.statusTesting); - describe('assigned to edition', utils.detail.assignedToTesting); + describe('assigned to edition', sharedDetail.assignedToTesting); - describe('watchers edition', utils.detail.watchersTesting); + describe('watchers edition', sharedDetail.watchersTesting); it('iocaine edition', async function() { // Toggle iocaine status @@ -52,20 +53,20 @@ describe('Task detail', function(){ expect(newIsIocaine).to.be.equal(isIocaine); }); - it('history', utils.detail.historyTesting); + it('history', sharedDetail.historyTesting); - it('block', utils.detail.blockTesting); + it('block', sharedDetail.blockTesting); - it('attachments', utils.detail.attachmentTesting); + it('attachments', sharedDetail.attachmentTesting); - describe('custom-fields', utils.detail.customFields.bind(this, 1)); + describe('custom-fields', sharedDetail.customFields.bind(this, 1)); it('screenshot', async function() { await utils.common.takeScreenshot("tasks", "detail updated"); }); describe('delete & redirect', function() { - it('delete', utils.detail.deleteTesting); + it('delete', sharedDetail.deleteTesting); it('redirected', async function (){ let url = await browser.getCurrentUrl(); diff --git a/e2e/suites/user-stories/user-story-detail.e2e.js b/e2e/suites/user-stories/user-story-detail.e2e.js index 2144b221..911f0013 100644 --- a/e2e/suites/user-stories/user-story-detail.e2e.js +++ b/e2e/suites/user-stories/user-story-detail.e2e.js @@ -1,4 +1,5 @@ var utils = require('../../utils'); +var sharedDetail = require('../../shared/detail'); var usDetailHelper = require('../../helpers').usDetail; var chai = require('chai'); @@ -25,15 +26,15 @@ describe('User story detail', function(){ await utils.common.takeScreenshot("user-stories", "detail"); }); - it('title edition', utils.detail.titleTesting); + it('title edition', sharedDetail.titleTesting); - it('tags edition', utils.detail.tagsTesting); + it('tags edition', sharedDetail.tagsTesting); - it('description edition', utils.detail.descriptionTesting); + it('description edition', sharedDetail.descriptionTesting); - it('status edition', utils.detail.statusTesting); + it('status edition', sharedDetail.statusTesting); - describe('assigned to edition', utils.detail.assignedToTesting); + describe('assigned to edition', sharedDetail.assignedToTesting); it('team requirement edition', async function() { let requirementHelper = usDetailHelper.teamRequirement(); @@ -65,15 +66,15 @@ describe('User story detail', function(){ expect(isRequired).to.be.equal(newIsRequired); }); - describe('watchers edition', utils.detail.watchersTesting); + describe('watchers edition', sharedDetail.watchersTesting); - it('history', utils.detail.historyTesting); + it('history', sharedDetail.historyTesting); - it('block', utils.detail.blockTesting); + it('block', sharedDetail.blockTesting); - it('attachments', utils.detail.attachmentTesting); + it('attachments', sharedDetail.attachmentTesting); - describe('custom-fields', utils.detail.customFields.bind(this, 0)); + describe('custom-fields', sharedDetail.customFields.bind(this, 0)); describe('related tasks', function() { it('create', async function() { @@ -118,7 +119,7 @@ describe('User story detail', function(){ }); describe('delete & redirect', function() { - it('delete', utils.detail.deleteTesting); + it('delete', sharedDetail.deleteTesting); it('redirected', async function (){ let url = await browser.getCurrentUrl(); diff --git a/e2e/suites/wiki.e2e.js b/e2e/suites/wiki.e2e.js index 86dbfe6c..d3610580 100644 --- a/e2e/suites/wiki.e2e.js +++ b/e2e/suites/wiki.e2e.js @@ -1,4 +1,5 @@ var utils = require('../utils'); +var sharedDetail = require('../shared/detail'); var wikiHelper = require('../helpers').wiki; var chai = require('chai'); @@ -71,7 +72,7 @@ describe('wiki', function() { await utils.common.takeScreenshot("wiki", "home-edition"); }); - it('attachments', utils.detail.attachmentTesting); + it('attachments', sharedDetail.attachmentTesting); it('delete', async function() { await wikiHelper.editor().delete(); diff --git a/e2e/utils/index.js b/e2e/utils/index.js index 34d7ac6a..677b2422 100644 --- a/e2e/utils/index.js +++ b/e2e/utils/index.js @@ -2,5 +2,4 @@ module.exports.common = require("./common"); module.exports.notifications = require("./notifications"); module.exports.lightbox = require("./lightbox"); module.exports.popover = require("./popover"); -module.exports.detail = require("./detail"); module.exports.nav = require("./nav");