From cbe286b6dea2df2105ed1a0ad26878ca6cf327e3 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 30 Nov 2015 09:03:05 +0100 Subject: [PATCH] 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