@grafana/e2e: fixes (#24960)

* Resolve Cypress bin path

... instead of expecting it to be in a place that it may not be, depending on de-duping/flattening of nested dependencies

* Remove dashboard before removing datasource

... it makes more sense and it fixes random issues, perhaps something to do with how the backend is implemented.

* Updated lockfile
This commit is contained in:
Steven Vachon
2020-05-20 20:49:36 -04:00
committed by GitHub
parent 9edd8b7c7e
commit 4c62689bc2
4 changed files with 14 additions and 5 deletions
+2 -1
View File
@@ -1,5 +1,6 @@
const execa = require('execa');
const program = require('commander');
const resolveBin = require('resolve-as-bin');
const { resolve, sep } = require('path');
const cypress = commandName => {
@@ -14,7 +15,7 @@ const cypress = commandName => {
stdio: 'inherit',
};
return execa(`${projectPath}/node_modules/.bin/cypress`, cypressOptions, execaOptions)
return execa(resolveBin('cypress'), cypressOptions, execaOptions)
.then(() => {}) // no return value
.catch(error => {
console.error(error.message);