Move cypress and dummy app under test folder

lilyMrt · Aug 20, 2018 · 1cd13d4 · 1cd13d4
1 parent cf794b6
commit 1cd13d4
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 102 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 /.log/
 /.nyc_output/
 /coverage/
-/cypress/videos/
+/cypress/
 /dist/
 /node_modules/
 /.DS_Store

diff --git a/cypress.json b/cypress.json
@@ -1,3 +1,5 @@
 {
+  "fixturesFolder": "test/fixtures",
+  "integrationFolder": "test/integration",
   "video": false
 }
diff --git a/cypress/.eslintrc.js b/cypress/.eslintrc.js
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
diff --git a/cypress/support/index.js b/cypress/support/index.js
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
@@ -12,10 +12,13 @@ module.exports = {
     'plugin:mocha/recommended'
   ],
   globals: {
-    document: false,
-    window: false,
+    Cypress: false,
+    Shepherd: false,
     assert: false,
-    Shepherd: false
+    cy: false,
+    document: false,
+    expect: false,
+    window: false
   },
   env: {
     browser: false,

diff --git a/cypress/dummy/css/prism.css → test/dummy/css/prism.css b/cypress/dummy/css/prism.css → test/dummy/css/prism.css
diff --git a/cypress/dummy/css/welcome.css → test/dummy/css/welcome.css b/cypress/dummy/css/welcome.css → test/dummy/css/welcome.css
diff --git a/cypress/dummy/css/welcome.css.map → test/dummy/css/welcome.css.map b/cypress/dummy/css/welcome.css.map → test/dummy/css/welcome.css.map
diff --git a/cypress/dummy/index.html → test/dummy/index.html b/cypress/dummy/index.html → test/dummy/index.html
@@ -11,8 +11,8 @@
   <link rel="stylesheet" href="/dist/css/shepherd-theme-arrows.css"/>
 
   <!-- Welcome docs styles -->
-  <link rel="stylesheet" href="/cypress/dummy/css/prism.css"/>
-  <link rel="stylesheet" href="/cypress/dummy/css/welcome.css"/>
+  <link rel="stylesheet" href="css/prism.css"/>
+  <link rel="stylesheet" href="css/welcome.css"/>
 </head>
 
 <body>
@@ -66,7 +66,7 @@ <h3>Example</h3>
         </p>
       </div>
       <div>
-        <img src="/cypress/dummy/sheep.svg"/>
+        <img src="sheep.svg"/>
       </div>
     </div>
   </div>
@@ -77,6 +77,6 @@ <h3>Example</h3>
 <script src="/dist/js/shepherd.js"></script>
 
 <!-- Welcome page -->
-<script src="/cypress/dummy/js/prism.js"></script>
+<script src="js/prism.js"></script>
 </body>
 </html>
diff --git a/cypress/dummy/js/prism.js → test/dummy/js/prism.js b/cypress/dummy/js/prism.js → test/dummy/js/prism.js
diff --git a/cypress/dummy/sheep.svg → test/dummy/sheep.svg b/cypress/dummy/sheep.svg → test/dummy/sheep.svg
diff --git a/cypress/integration/test.shepherd.js → test/integration/test.shepherd.js b/cypress/integration/test.shepherd.js → test/integration/test.shepherd.js
@@ -6,7 +6,7 @@ describe('Shepherd Acceptance Tests', () => {
   beforeEach(() => {
     Shepherd = null;
 
-    cy.visit('http://localhost:8080/cypress/dummy/', {
+    cy.visit('http://localhost:8080/test/dummy/', {
       onLoad(contentWindow) {
         if (contentWindow.Shepherd) {
           return Shepherd = contentWindow.Shepherd;

diff --git a/cypress/utils/default-steps.js → test/utils/default-steps.js b/cypress/utils/default-steps.js → test/utils/default-steps.js
diff --git a/cypress/utils/setup-tour.js → test/utils/setup-tour.js b/cypress/utils/setup-tour.js → test/utils/setup-tour.js