Merge pull request #325 from GIScience/test/312-migrate-integration-t…

…ests

test/312 migrate integration tests

.eslintignore

@@ -2,6 +2,4 @@
 /config/
 /dist/
 /*.js
-/test/unit/coverage/
-/test/integration/mockups
 /src/ors-js/node_modules/

.gitignore

@@ -4,13 +4,6 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-/tests/coverage/
-/tests/unit/coverage/
-/tests/integration/coverage/
-/tests/e2e/reports/
-/tests/e2e/downloads/*
-selenium-debug.log
-selenium-server.log
 /src/ors-js/
 
 # Editor directories and files
@@ -21,8 +14,6 @@ selenium-server.log
 *.njsproj
 *.sln
 
-!/tests/e2e/downloads/.gitkeep
-
 ## The ignores below can be removed/commented in the case
 ## you want to include the config files, the plugins
 ## and the built static app in a custom repo.
@@ -48,4 +39,5 @@ selenium-server.log
 # cypress tests
 /cypress/videos/
 /cypress/screenshots/
+/cypress/downloads/
 /index.html

build/webpack.base.conf.js

@@ -37,7 +37,8 @@ module.exports = {
   resolve: {
     alias: {
       '@': resolveRoot('src'),
-      'vue$': 'vue/dist/vue.esm.js'
+      'vue$': 'vue/dist/vue.esm.js',
+      'fixtures': resolveRoot('cypress/fixtures')
     },
     extensions: ['.vue', '.js', '.json'],
     fallback: {

build/webpack.cypress.conf.js

@@ -3,7 +3,24 @@ const { resolveRoot, styleLoaders} = require('./utils')
 const config = require('../config')
 const vueLoaderConfig = require('./vue-loader.conf')
 const webpack = require('webpack')
+const packageJson = require("../package.json")
 
+let ORSKEY = process.env.ORSKEY
+let BITLYLOGIN = process.env.BITLYLOGIN
+let BITLYAPIKEY = process.env.BITLYAPIKEY
+
+let env = {
+  PACKAGE_JSON: JSON.stringify(packageJson)
+}
+if (ORSKEY) {
+  env.ORSKEY = `"${ORSKEY}"`
+}
+if (BITLYLOGIN) {
+  env.BITLYLOGIN = `"${BITLYLOGIN}"`
+}
+if (BITLYAPIKEY) {
+  env.BITLYAPIKEY = `"${BITLYAPIKEY}"`
+}
 
 const createLintingRule = () => ({
   test: /\.(js|vue)$/,
@@ -22,6 +39,9 @@ module.exports = {
     // fix "process is not defined" error:
     new webpack.ProvidePlugin({
       process: 'process/browser',
+    }),
+    new webpack.DefinePlugin({
+      'process.env': env
     })
   ],
   context: resolveRoot(),
@@ -37,7 +57,8 @@ module.exports = {
   resolve: {
     alias: {
       '@': resolveRoot('src'),
-      'vue$': 'vue/dist/vue.esm.js'
+      'vue$': 'vue/dist/vue.esm.js',
+      'fixtures': resolveRoot('cypress/fixtures')
     },
     extensions: ['.vue', '.js', '.json'],
     fallback: {