Merge branch 'develop' into feature/move-before-complete

howardroark · Feb 26, 2017 · 3a4e692 · 3a4e692
2 parents 63088be + 0443f05
commit 3a4e692
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 12 deletions.
diff --git a/tests/data-complete.json → tests/mocks/data-complete.json b/tests/data-complete.json → tests/mocks/data-complete.json
diff --git a/tests/data-no-discard.json → tests/mocks/data-no-discard.json b/tests/data-no-discard.json → tests/mocks/data-no-discard.json
diff --git a/tests/data-no-move.json → tests/mocks/data-no-move.json b/tests/data-no-move.json → tests/mocks/data-no-move.json
diff --git a/tests/data-parse-all.json → tests/mocks/data-parse-all.json b/tests/data-parse-all.json → tests/mocks/data-parse-all.json
diff --git a/tests/data.json → tests/mocks/data.json b/tests/data.json → tests/mocks/data.json
diff --git a/tests/template-no-data/Dockerfile → tests/mocks/template-no-data/Dockerfile b/tests/template-no-data/Dockerfile → tests/mocks/template-no-data/Dockerfile
diff --git a/tests/template-no-data/PROJECT-README → tests/mocks/template-no-data/PROJECT-README b/tests/template-no-data/PROJECT-README → tests/mocks/template-no-data/PROJECT-README
diff --git a/tests/template-no-data/README.md → tests/mocks/template-no-data/README.md b/tests/template-no-data/README.md → tests/mocks/template-no-data/README.md
diff --git a/tests/template-no-data/project-name → tests/mocks/template-no-data/project-name b/tests/template-no-data/project-name → tests/mocks/template-no-data/project-name
diff --git a/...plate-no-data/project-name-dir/.gitignore → ...plate-no-data/project-name-dir/.gitignore b/...plate-no-data/project-name-dir/.gitignore → ...plate-no-data/project-name-dir/.gitignore
diff --git a/tests/template-no-data/project-name-nested → ...ocks/template-no-data/project-name-nested b/tests/template-no-data/project-name-nested → ...ocks/template-no-data/project-name-nested
diff --git a/tests/template/Dockerfile → tests/mocks/template/Dockerfile b/tests/template/Dockerfile → tests/mocks/template/Dockerfile
diff --git a/tests/template/PROJECT-README → tests/mocks/template/PROJECT-README b/tests/template/PROJECT-README → tests/mocks/template/PROJECT-README
diff --git a/tests/template/README.md → tests/mocks/template/README.md b/tests/template/README.md → tests/mocks/template/README.md
diff --git a/tests/template/project-name → tests/mocks/template/project-name b/tests/template/project-name → tests/mocks/template/project-name
diff --git a/tests/template/project-name-dir/.gitignore → ...ocks/template/project-name-dir/.gitignore b/tests/template/project-name-dir/.gitignore → ...ocks/template/project-name-dir/.gitignore
diff --git a/tests/template/project-name-nested → tests/mocks/template/project-name-nested b/tests/template/project-name-nested → tests/mocks/template/project-name-nested
diff --git a/tests/template/template.json → tests/mocks/template/template.json b/tests/template/template.json → tests/mocks/template/template.json
diff --git a/tests/test.js b/tests/test.js
@@ -39,7 +39,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "howardroark/webapp",
-                "tests/data.json"
+                "tests/mocks/data.json"
             ],
             "options": {
                 //..
@@ -55,7 +55,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "howardroark/webapp",
-                "https://raw.githubusercontent.com/howardroark/pollinate/develop/tests/data.json"
+                "https://raw.githubusercontent.com/howardroark/pollinate/develop/tests/mocks/data.json"
             ],
             "options": {
                 //..
@@ -232,8 +232,8 @@ describe('Test basic example', function () {
         this.timeout(10000);
         pollinate({
             "inputs": [
-                "./tests/template",
-                "tests/data.json"
+                "./tests/mocks/template",
+                "tests/mocks/data.json"
             ],
             "options": {
                 //..
@@ -248,8 +248,8 @@ describe('Test basic example', function () {
         this.timeout(10000);
         pollinate({
             "inputs": [
-                "./tests/template-no-data/",
-                "tests/data-no-discard.json"
+                "./tests/mocks/template-no-data/",
+                "tests/mocks/data-no-discard.json"
             ],
             "options": {
                 //
@@ -264,8 +264,8 @@ describe('Test basic example', function () {
         this.timeout(10000);
         pollinate({
             "inputs": [
-                "./tests/template-no-data/",
-                "tests/data-parse-all.json"
+                "./tests/mocks/template-no-data/",
+                "tests/mocks/data-parse-all.json"
             ],
             "options": {
                 //
@@ -280,8 +280,8 @@ describe('Test basic example', function () {
         this.timeout(10000);
         pollinate({
             "inputs": [
-                "./tests/template-no-data/",
-                "tests/data-no-move.json"
+                "./tests/mocks/template-no-data/",
+                "tests/mocks/data-no-move.json"
             ],
             "options": {
                 //
@@ -296,8 +296,8 @@ describe('Test basic example', function () {
         this.timeout(10000);
         pollinate({
             "inputs": [
-                "./tests/template-no-data/",
-                "tests/data-complete.json"
+                "./tests/mocks/template-no-data/",
+                "tests/mocks/data-complete.json"
             ],
             "options": {
                 //