@graphprotocol/graph-cli 0.43.1-alpha-20230320211532-95edea6 → 0.43.1-alpha-20230321032415-91f97ff

package/CHANGELOG.md

@@ -1,9 +1,14 @@
 # @graphprotocol/graph-cli
 
-## 0.43.1-alpha-20230320211532-95edea6
+## 0.43.1-alpha-20230321032415-91f97ff
 
 ### Patch Changes
 
+- [#1201](https://github.com/graphprotocol/graph-tooling/pull/1201)
+  [`91f97ff`](https://github.com/graphprotocol/graph-tooling/commit/91f97ff8893d20d288e84312062f33060d5f0b4e)
+  Thanks [@saihaj](https://github.com/saihaj)! - read testsFolder from matchstick yaml and set the
+  paths based on that
+
 - [#1201](https://github.com/graphprotocol/graph-tooling/pull/1201)
   [`95edea6`](https://github.com/graphprotocol/graph-tooling/commit/95edea632dee687d18bcffa19d4108fe5da99a94)
   Thanks [@saihaj](https://github.com/saihaj)! - make datasource and version optional args for test

package/dist/commands/test.js

@@ -15,28 +15,16 @@ const semver_1 = __importDefault(require("semver"));
 class TestCommand extends core_1.Command {
     async run() {
         const { args: { datasource }, flags: { coverage, docker, force, logs, recompile, version }, } = await this.parse(TestCommand);
-        const testsDir = './tests';
-        const cachePath = path_1.default.resolve(testsDir, '.latest.json');
-        const opts = {
-            testsDir,
-            cachePath,
-            coverage,
-            docker,
-            force,
-            logs,
-            recompile,
-            version,
-            latestVersion: getLatestVersionFromCache(cachePath),
-        };
+        let testsDir = './tests';
         // Check if matchstick.yaml config exists
         if (gluegun_1.filesystem.exists('matchstick.yaml')) {
             try {
                 // Load the config
                 const config = await js_yaml_1.default.load(gluegun_1.filesystem.read('matchstick.yaml', 'utf8'));
-                // Check if matchstick.yaml and testsDir not null
-                if (config?.testsDir) {
+                // Check if matchstick.yaml and testsFolder not null
+                if (config?.testsFolder) {
                     // assign test folder from matchstick.yaml if present
-                    opts.testsDir = config.testsDir;
+                    testsDir = config.testsFolder;
                 }
             }
             catch (error) {
@@ -45,6 +33,18 @@ class TestCommand extends core_1.Command {
                 });
             }
         }
+        const cachePath = path_1.default.resolve(testsDir, '.latest.json');
+        const opts = {
+            testsDir,
+            cachePath,
+            coverage,
+            docker,
+            force,
+            logs,
+            recompile,
+            version,
+            latestVersion: getLatestVersionFromCache(cachePath),
+        };
         // Fetch the latest version tag if version is not specified with -v/--version or if the version is not cached
         if (opts.force || (!opts.version && !opts.latestVersion)) {
             this.log('Fetching latest version tag...');
@@ -200,7 +200,7 @@ async function runDocker(datasource, opts) {
     // Get current working directory
     const current_folder = gluegun_1.filesystem.cwd();
     // Declate dockerfilePath with default location
-    const dockerfilePath = path_1.default.join(opts.testsDir || 'tests', '.docker/Dockerfile');
+    const dockerfilePath = path_1.default.join(opts.testsDir, '.docker/Dockerfile');
     // Check if the Dockerfil already exists
     const dockerfileExists = gluegun_1.filesystem.exists(dockerfilePath);
     // Generate the Dockerfile only if it doesn't exists,

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.43.1-alpha-20230320211532-95edea6",
+  "version": "0.43.1-alpha-20230321032415-91f97ff",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.43.1-alpha-20230320211532-95edea6",
+  "version": "0.43.1-alpha-20230321032415-91f97ff",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {