From 05290fbb04afedc35cb08e936ed09a72b740f00a Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 25 Jun 2015 08:02:05 +0200
Subject: [PATCH] rename integrationSpec to e2e

---
 .gitignore                                                  | 2 +-
 integration-test-conf.js => conf.e2e.js                     | 6 +++---
 .../auth/auth.integrationSpec.js => e2e/auth/auth.e2e.js    | 0
 .../backlog.integrationSpec.js => e2e/full/backlog.e2e.js   | 0
 .../full/home.integrationSpec.js => e2e/full/home.e2e.js    | 0
 .../full/project-home.e2e.js                                | 4 ++--
 {integration => e2e}/utils/common.js                        | 0
 {integration => e2e}/utils/index.js                         | 0
 {integration => e2e}/utils/lightbox.js                      | 0
 {integration => e2e}/utils/notifications.js                 | 0
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename integration-test-conf.js => conf.e2e.js (84%)
 rename integration/auth/auth.integrationSpec.js => e2e/auth/auth.e2e.js (100%)
 rename integration/full/backlog.integrationSpec.js => e2e/full/backlog.e2e.js (100%)
 rename integration/full/home.integrationSpec.js => e2e/full/home.e2e.js (100%)
 rename integration/full/project-home.integrationSpec.js => e2e/full/project-home.e2e.js (86%)
 rename {integration => e2e}/utils/common.js (100%)
 rename {integration => e2e}/utils/index.js (100%)
 rename {integration => e2e}/utils/lightbox.js (100%)
 rename {integration => e2e}/utils/notifications.js (100%)

diff --git a/.gitignore b/.gitignore
index 81383148..1731e03e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ tmp/
 app/config/main.coffee
 app/plugins/taiga-front-extras
 scss-lint.log
-integration/screenshots/
\ No newline at end of file
+e2e/screenshots/
\ No newline at end of file
diff --git a/integration-test-conf.js b/conf.e2e.js
similarity index 84%
rename from integration-test-conf.js
rename to conf.e2e.js
index d6013ba8..27afdcb1 100644
--- a/integration-test-conf.js
+++ b/conf.e2e.js
@@ -2,7 +2,7 @@ require("babel/register")({
     stage: 1
 });
 
-var utils = require('./integration/utils');
+var utils = require('./e2e/utils');
 
 exports.config = {
     seleniumAddress: 'http://localhost:4444/wd/hub',
@@ -11,8 +11,8 @@ exports.config = {
         timeout: 5000
     },
     suites: {
-        auth: 'integration/auth/*.integrationSpec.js',
-        full: 'integration/full/**/*integrationSpec.js'
+        auth: 'e2e/auth/*.e2e.js',
+        full: 'e2e/full/**/*.e2e.js'
     },
     onPrepare: function() {
         browser.get('http://localhost:9001/login');
diff --git a/integration/auth/auth.integrationSpec.js b/e2e/auth/auth.e2e.js
similarity index 100%
rename from integration/auth/auth.integrationSpec.js
rename to e2e/auth/auth.e2e.js
diff --git a/integration/full/backlog.integrationSpec.js b/e2e/full/backlog.e2e.js
similarity index 100%
rename from integration/full/backlog.integrationSpec.js
rename to e2e/full/backlog.e2e.js
diff --git a/integration/full/home.integrationSpec.js b/e2e/full/home.e2e.js
similarity index 100%
rename from integration/full/home.integrationSpec.js
rename to e2e/full/home.e2e.js
diff --git a/integration/full/project-home.integrationSpec.js b/e2e/full/project-home.e2e.js
similarity index 86%
rename from integration/full/project-home.integrationSpec.js
rename to e2e/full/project-home.e2e.js
index b19cdf62..faf9e716 100644
--- a/integration/full/project-home.integrationSpec.js
+++ b/e2e/full/project-home.e2e.js
@@ -20,7 +20,7 @@ describe('project home', function() {
     });
 
     it('timeline filled', function() {
-        return expect($$('div[tg-user-timeline-item]').count()).to.be.eventually.above(0);
+        expect($$('div[tg-user-timeline-item]').count()).to.be.eventually.above(0);
     });
 
     it('timeline pagination', async function() {
@@ -37,6 +37,6 @@ describe('project home', function() {
     });
 
     it('team filled', function() {
-        return expect($$('ul.involved-team a').count()).to.be.eventually.above(0);
+        expect($$('ul.involved-team a').count()).to.be.eventually.above(0);
     });
 });
diff --git a/integration/utils/common.js b/e2e/utils/common.js
similarity index 100%
rename from integration/utils/common.js
rename to e2e/utils/common.js
diff --git a/integration/utils/index.js b/e2e/utils/index.js
similarity index 100%
rename from integration/utils/index.js
rename to e2e/utils/index.js
diff --git a/integration/utils/lightbox.js b/e2e/utils/lightbox.js
similarity index 100%
rename from integration/utils/lightbox.js
rename to e2e/utils/lightbox.js
diff --git a/integration/utils/notifications.js b/e2e/utils/notifications.js
similarity index 100%
rename from integration/utils/notifications.js
rename to e2e/utils/notifications.js