From be77be2ddc5c182c6503141acf0b494f88c41082 Mon Sep 17 00:00:00 2001
From: Jimmy Chen Chen <jimmy.chenchen@ecadlabs.com>
Date: Mon, 19 Sep 2022 12:41:01 -0700
Subject: [PATCH 1/6] Add test task for ligo plugin

---
 taqueria-plugin-ligo/compile.ts |  3 +-
 taqueria-plugin-ligo/index.ts   |  7 +++++
 taqueria-plugin-ligo/ligo.ts    |  5 ++--
 taqueria-plugin-ligo/test.ts    | 53 +++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 taqueria-plugin-ligo/test.ts

diff --git a/taqueria-plugin-ligo/compile.ts b/taqueria-plugin-ligo/compile.ts
index 10dc71c293..a130f20892 100644
--- a/taqueria-plugin-ligo/compile.ts
+++ b/taqueria-plugin-ligo/compile.ts
@@ -161,7 +161,7 @@ const compileExprs = (parsedArgs: Opts, sourceFile: string, exprKind: ExprKind):
 		})
 		.then(mergeArtifactsOutput(sourceFile));
 
-const compileContractWithStorageAndParameter = async (parsedArgs: Opts, sourceFile: string) => {
+const compileContractWithStorageAndParameter = async (parsedArgs: Opts, sourceFile: string): Promise<TableRow[]> => {
 	const contractCompileResult = await compileContract(parsedArgs, sourceFile);
 	if (contractCompileResult.artifact === COMPILE_ERR_MSG) return [contractCompileResult];
 
@@ -226,7 +226,6 @@ const mergeArtifactsOutput = (sourceFile: string) =>
 
 export const compile = (parsedArgs: Opts): Promise<void> => {
 	const sourceFile = parsedArgs.sourceFile;
-	if (!sourceFile) return sendAsyncErr('No source file specified.');
 	let p: Promise<TableRow[]>;
 	if (isStoragesFile(sourceFile)) p = compileExprs(parsedArgs, sourceFile, 'storage');
 	else if (isParametersFile(sourceFile)) p = compileExprs(parsedArgs, sourceFile, 'parameter');
diff --git a/taqueria-plugin-ligo/index.ts b/taqueria-plugin-ligo/index.ts
index 7958041d9d..7ff3886d08 100644
--- a/taqueria-plugin-ligo/index.ts
+++ b/taqueria-plugin-ligo/index.ts
@@ -16,6 +16,13 @@ Plugin.create(i18n => ({
 			handler: 'proxy',
 			encoding: 'json',
 		}),
+		Task.create({
+			task: 'test',
+			command: 'test <sourceFile>',
+			description: 'Test a smart contract written in LIGO',
+			handler: 'proxy',
+			encoding: 'json',
+		}),
 	],
 	templates: [
 		Template.create({
diff --git a/taqueria-plugin-ligo/ligo.ts b/taqueria-plugin-ligo/ligo.ts
index 347570e4c9..61109724ae 100644
--- a/taqueria-plugin-ligo/ligo.ts
+++ b/taqueria-plugin-ligo/ligo.ts
@@ -1,6 +1,7 @@
 import { sendAsyncErr } from '@taqueria/node-sdk';
 import { RequestArgs } from '@taqueria/node-sdk/types';
 import compile from './compile';
+import { test } from './test';
 
 interface Opts extends RequestArgs.ProxyRequestArgs {
 	sourceFile: string;
@@ -10,8 +11,8 @@ export const ligo = (parsedArgs: Opts): Promise<void> => {
 	switch (parsedArgs.task) {
 		case 'compile':
 			return compile(parsedArgs);
-		// case 'test':
-		// 	return test(parsedArgs); // TODO: to be implemented in the future
+		case 'test':
+			return test(parsedArgs);
 		default:
 			return sendAsyncErr(`${parsedArgs.task} is not an understood task by the LIGO plugin`);
 	}
diff --git a/taqueria-plugin-ligo/test.ts b/taqueria-plugin-ligo/test.ts
new file mode 100644
index 0000000000..a02fdaa729
--- /dev/null
+++ b/taqueria-plugin-ligo/test.ts
@@ -0,0 +1,53 @@
+import { execCmd, getArch, sendAsyncErr, sendErr, sendJsonRes, sendWarn } from '@taqueria/node-sdk';
+import { RequestArgs } from '@taqueria/node-sdk/types';
+import { access, readFile, writeFile } from 'fs/promises';
+import { basename, extname, join } from 'path';
+
+interface Opts extends RequestArgs.t {
+	sourceFile: string;
+}
+
+type TableRow = { contract: string; testResults: string };
+
+const getInputFilename = (parsedArgs: Opts, sourceFile: string): string =>
+	join(parsedArgs.config.contractsDir, sourceFile);
+
+const getTestContractCmd = (parsedArgs: Opts, sourceFile: string): string => {
+	const projectDir = process.env.PROJECT_DIR ?? parsedArgs.projectDir;
+	if (!projectDir) throw `No project directory provided`;
+	const baseCmd =
+		`DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm -v \"${projectDir}\":/project -w /project -u $(id -u):$(id -g) ligolang/ligo:next run test`;
+	const inputFile = getInputFilename(parsedArgs, sourceFile);
+	const cmd = `${baseCmd} ${inputFile}`;
+	return cmd;
+};
+
+const testContract = (parsedArgs: Opts, sourceFile: string): Promise<TableRow> =>
+	getArch()
+		.then(() => getTestContractCmd(parsedArgs, sourceFile))
+		.then(execCmd)
+		.then(({ stdout, stderr }) => {
+			if (stderr.length > 0) sendWarn(stderr);
+			const result = '🎉 All tests passed 🎉';
+			return {
+				contract: sourceFile,
+				testResults: stdout.length > 0 ? `${stdout}\n${result}` : result,
+			};
+		})
+		.catch(err => {
+			sendErr(`\n=== For ${sourceFile} ===`);
+			sendErr(err.message.replace(/Command failed.+?\n/, ''));
+			return {
+				contract: sourceFile,
+				testResults: 'Some tests failed :(',
+			};
+		});
+
+export const test = (parsedArgs: Opts): Promise<void> => {
+	const sourceFile = parsedArgs.sourceFile;
+	return testContract(parsedArgs, sourceFile).then(results => [results]).then(sendJsonRes).catch(err =>
+		sendAsyncErr(err, false)
+	);
+};
+
+export default test;

From 7881ac43ad6d3df489337ae2c910794295ee9ee4 Mon Sep 17 00:00:00 2001
From: Jimmy Chen Chen <jimmy.chenchen@ecadlabs.com>
Date: Mon, 19 Sep 2022 13:07:03 -0700
Subject: [PATCH 2/6] Fix help menu tests

---
 taqueria-plugin-ligo/test.ts                  | 2 +-
 tests/e2e/data/help-contents/help-contents.ts | 2 ++
 tests/e2e/data/help-contents/ligo-contents.ts | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/taqueria-plugin-ligo/test.ts b/taqueria-plugin-ligo/test.ts
index a02fdaa729..6ca6ab68ad 100644
--- a/taqueria-plugin-ligo/test.ts
+++ b/taqueria-plugin-ligo/test.ts
@@ -45,7 +45,7 @@ const testContract = (parsedArgs: Opts, sourceFile: string): Promise<TableRow> =
 
 export const test = (parsedArgs: Opts): Promise<void> => {
 	const sourceFile = parsedArgs.sourceFile;
-	return testContract(parsedArgs, sourceFile).then(results => [results]).then(sendJsonRes).catch(err =>
+	return testContract(parsedArgs, sourceFile).then(result => [result]).then(sendJsonRes).catch(err =>
 		sendAsyncErr(err, false)
 	);
 };
diff --git a/tests/e2e/data/help-contents/help-contents.ts b/tests/e2e/data/help-contents/help-contents.ts
index 4850812c36..5358d87fd2 100644
--- a/tests/e2e/data/help-contents/help-contents.ts
+++ b/tests/e2e/data/help-contents/help-contents.ts
@@ -54,6 +54,7 @@ Commands:
   taq list-contracts              List registered contracts
   taq compile                     Provided by more than one plugin. The option -
                                   -plugin is required.
+  taq test <sourceFile>           Test a smart contract written in LIGO
   taq create <template>           Create files from pre-existing templates
 
 Options:
@@ -96,6 +97,7 @@ Commands:
   taq list-contracts              List registered contracts
   taq compile                     Provided by more than one plugin. The option -
                                   -plugin is required.
+  taq test <sourceFile>           Test a smart contract written in LIGO
   taq create <template>           Create files from pre-existing templates
 
 Options:
diff --git a/tests/e2e/data/help-contents/ligo-contents.ts b/tests/e2e/data/help-contents/ligo-contents.ts
index f65f7442ff..c94e3997d1 100644
--- a/tests/e2e/data/help-contents/ligo-contents.ts
+++ b/tests/e2e/data/help-contents/ligo-contents.ts
@@ -13,6 +13,7 @@ Commands:
                                   tax to Michelson code, along with its associat
                                   ed storages and parameters files if they are f
                                   ound                [aliases: c, compile-ligo]
+  taq test <sourceFile>           Test a smart contract written in LIGO
   taq create <template>           Create files from pre-existing templates
 
 Options:

From 3d4462d006e8e55bcdbafbcf00217b2dc6242267 Mon Sep 17 00:00:00 2001
From: Jimmy Chen Chen <jimmy.chenchen@ecadlabs.com>
Date: Mon, 19 Sep 2022 13:57:48 -0700
Subject: [PATCH 3/6] Clean up unused imports

---
 taqueria-plugin-ligo/test.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/taqueria-plugin-ligo/test.ts b/taqueria-plugin-ligo/test.ts
index 6ca6ab68ad..ab4944cb80 100644
--- a/taqueria-plugin-ligo/test.ts
+++ b/taqueria-plugin-ligo/test.ts
@@ -1,7 +1,6 @@
 import { execCmd, getArch, sendAsyncErr, sendErr, sendJsonRes, sendWarn } from '@taqueria/node-sdk';
 import { RequestArgs } from '@taqueria/node-sdk/types';
-import { access, readFile, writeFile } from 'fs/promises';
-import { basename, extname, join } from 'path';
+import { join } from 'path';
 
 interface Opts extends RequestArgs.t {
 	sourceFile: string;

From 572bf9dbd7415fa2a7cd4ab11f29da9aa4c73c5e Mon Sep 17 00:00:00 2001
From: Jimmy Chen Chen <jimmy.chenchen@ecadlabs.com>
Date: Mon, 19 Sep 2022 15:08:07 -0700
Subject: [PATCH 4/6] Add doc for test task of ligo plugin

---
 taqueria-plugin-ligo/README.md   | 67 ++++++++++++++++++++++++++++++++
 taqueria-plugin-ligo/_readme.eta | 67 ++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/taqueria-plugin-ligo/README.md b/taqueria-plugin-ligo/README.md
index 1147493d19..4cd559cff8 100644
--- a/taqueria-plugin-ligo/README.md
+++ b/taqueria-plugin-ligo/README.md
@@ -54,6 +54,73 @@ Lastly, `taq compile hello.mligo` will compile `hello.mligo` and emit `hello.tz`
 
 None for now.
 
+## The `taq test` Task
+
+Basic usage is:
+
+```shell
+taq test <filename>
+```
+
+### Basic description
+This task tests the LIGO source code and ouputs a result suggesting a failure or success. Normally you'd have a contract file and a separate test file that includes the contract's code, both within the `/contracts` directory.
+
+For example, refer to the following 2 code snippets:
+```ligo title="counter.mligo"
+type storage = int
+
+type parameter =
+  Increment of int
+| Decrement of int
+| Reset
+
+type return = operation list * storage
+
+// Two entrypoints
+
+let add (store, delta : storage * int) : storage = store + delta
+let sub (store, delta : storage * int) : storage = store - delta
+
+(* Main access point that dispatches to the entrypoints according to
+   the smart contract parameter. *)
+
+let main (action, store : parameter * storage) : return =
+ ([] : operation list),    // No operations
+ (match action with
+   Increment (n) -> add (store, n)
+ | Decrement (n) -> sub (store, n)
+ | Reset         -> 0)
+```
+
+```ligo title="testCounter.mligo"
+#include "counter.mligo"
+
+let initial_storage = 42
+
+let test_initial_storage =
+ let (taddr, _, _) = Test.originate main initial_storage 0tez in
+ assert (Test.get_storage taddr = initial_storage)
+
+let test_increment =
+ let (taddr, _, _) = Test.originate main initial_storage 0tez in
+ let contr = Test.to_contract taddr in
+ let _ = Test.transfer_to_contract_exn contr (Increment 1) 1mutez in
+ assert (Test.get_storage taddr = initial_storage + 1)
+```
+
+By running `taq test testCounter.mligo`, you should get the following:
+```
+┌───────────────────┬──────────────────────────────────────────────┐
+│ Contract          │ Test Results                                 │
+├───────────────────┼──────────────────────────────────────────────┤
+│ testCounter.mligo │ Everything at the top-level was executed.    │
+│                   │ - test_initial_storage exited with value (). │
+│                   │ - test_increment exited with value ().       │
+│                   │                                              │
+│                   │ 🎉 All tests passed 🎉                        │
+└───────────────────┴──────────────────────────────────────────────┘
+```
+
 ## Template creation
 The LIGO plugin also exposes a contract template via the `taq create contract <contractName>` task. This task will create a new LIGO contract in the `contracts` directory, insert some boilerplate LIGO contract code and will register the contract with Taqueria
 
diff --git a/taqueria-plugin-ligo/_readme.eta b/taqueria-plugin-ligo/_readme.eta
index 65405d1342..6755c68b08 100644
--- a/taqueria-plugin-ligo/_readme.eta
+++ b/taqueria-plugin-ligo/_readme.eta
@@ -59,6 +59,73 @@ Make sure you name it `hello.storages.mligo` and not `hello.storage.mligo` (note
 
 None for now.
 
+## The `taq test` Task
+
+Basic usage is:
+
+```shell
+taq test <filename>
+```
+
+### Basic description
+This task tests the LIGO source code and ouputs a result suggesting a failure or success. Normally you'd have a contract file and a separate test file that includes the contract's code, both within the `/contracts` directory.
+
+For example, refer to the following 2 code snippets:
+```ligo title="counter.mligo"
+type storage = int
+
+type parameter =
+  Increment of int
+| Decrement of int
+| Reset
+
+type return = operation list * storage
+
+// Two entrypoints
+
+let add (store, delta : storage * int) : storage = store + delta
+let sub (store, delta : storage * int) : storage = store - delta
+
+(* Main access point that dispatches to the entrypoints according to
+   the smart contract parameter. *)
+
+let main (action, store : parameter * storage) : return =
+ ([] : operation list),    // No operations
+ (match action with
+   Increment (n) -> add (store, n)
+ | Decrement (n) -> sub (store, n)
+ | Reset         -> 0)
+```
+
+```ligo title="testCounter.mligo"
+#include "counter.mligo"
+
+let initial_storage = 42
+
+let test_initial_storage =
+ let (taddr, _, _) = Test.originate main initial_storage 0tez in
+ assert (Test.get_storage taddr = initial_storage)
+
+let test_increment =
+ let (taddr, _, _) = Test.originate main initial_storage 0tez in
+ let contr = Test.to_contract taddr in
+ let _ = Test.transfer_to_contract_exn contr (Increment 1) 1mutez in
+ assert (Test.get_storage taddr = initial_storage + 1)
+```
+
+By running `taq test testCounter.mligo`, you should get the following:
+```
+┌───────────────────┬──────────────────────────────────────────────┐
+│ Contract          │ Test Results                                 │
+├───────────────────┼──────────────────────────────────────────────┤
+│ testCounter.mligo │ Everything at the top-level was executed.    │
+│                   │ - test_initial_storage exited with value (). │
+│                   │ - test_increment exited with value ().       │
+│                   │                                              │
+│                   │ 🎉 All tests passed 🎉                        │
+└───────────────────┴──────────────────────────────────────────────┘
+```
+
 ## Template creation
 The LIGO plugin also exposes a contract template via the `taq create contract <contractName>` task. This task will create a new LIGO contract in the `contracts` directory, insert some boilerplate LIGO contract code and will register the contract with Taqueria
 

From 8cb6fcde1984796ce74160e5ed9d66bee4b91ad3 Mon Sep 17 00:00:00 2001
From: Ivan Romanov <sinapsist@gmail.com>
Date: Tue, 20 Sep 2022 10:36:11 -0700
Subject: [PATCH 5/6] Added e2e tests

---
 .../e2e/data/hello-tacos-invalid-tests.mligo  | 13 +++++
 tests/e2e/data/hello-tacos-tests.mligo        | 13 +++++
 tests/e2e/taqueria-plugin-ligo.spec.ts        | 56 ++++++++++++++++---
 3 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 tests/e2e/data/hello-tacos-invalid-tests.mligo
 create mode 100644 tests/e2e/data/hello-tacos-tests.mligo

diff --git a/tests/e2e/data/hello-tacos-invalid-tests.mligo b/tests/e2e/data/hello-tacos-invalid-tests.mligo
new file mode 100644
index 0000000000..c9c9d99cbd
--- /dev/null
+++ b/tests/e2e/data/hello-tacos-invalid-tests.mligo
@@ -0,0 +1,13 @@
+#include "hello-tacos.mligo"
+
+let available_tacos = 100
+
+let test_available_tacos =
+ let (taddr, _, _) = Test.originate main initial_storage 100tez in
+ assert (Test.get_storage taddr = available_tacos)
+
+let test_buy_tacos =
+ let (taddr, _, _) = Test.originate main initial_storage 100tez in
+ let contr = Test.to_contract taddr in
+ let _ = Test.transfer_to_contract_exn contr 1mutez in
+ assert (Test.get_storage taddr = test_available_tacos  - 1)
\ No newline at end of file
diff --git a/tests/e2e/data/hello-tacos-tests.mligo b/tests/e2e/data/hello-tacos-tests.mligo
new file mode 100644
index 0000000000..cbb9393f1b
--- /dev/null
+++ b/tests/e2e/data/hello-tacos-tests.mligo
@@ -0,0 +1,13 @@
+#include "hello-tacos.mligo"
+
+let available_tacos = 100n
+
+let test_available_tacos =
+ let (taddr, _, _) = Test.originate main available_tacos 100tez in
+ assert (Test.get_storage taddr = available_tacos)
+
+let test_buy_tacos =
+ let (taddr, _, _) = Test.originate main available_tacos 100tez in
+ let contr = Test.to_contract taddr in
+ let _ = Test.transfer_to_contract_exn contr 1n in
+ assert (Test.get_storage taddr = 100n)
\ No newline at end of file
diff --git a/tests/e2e/taqueria-plugin-ligo.spec.ts b/tests/e2e/taqueria-plugin-ligo.spec.ts
index b73c1d50e0..86043d1aad 100644
--- a/tests/e2e/taqueria-plugin-ligo.spec.ts
+++ b/tests/e2e/taqueria-plugin-ligo.spec.ts
@@ -19,7 +19,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		} catch (_) {}
 	});
 
-	test('Verify that the ligo plugin exposes the associated commands in the help menu', async () => {
+	test.skip('Verify that the ligo plugin exposes the associated commands in the help menu', async () => {
 		try {
 			const ligoHelpContents = await exec(`taq --help --projectDir=${taqueriaProjectPath}`);
 			expect(ligoHelpContents.stdout).toBe(contents.helpContentsLigoPlugin);
@@ -28,7 +28,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that the ligo plugin exposes the associated options in the help menu', async () => {
+	test.skip('Verify that the ligo plugin exposes the associated options in the help menu', async () => {
 		try {
 			const ligoHelpContents = await exec(`taq compile --help --projectDir=${taqueriaProjectPath}`);
 			expect(ligoHelpContents.stdout).toBe(contents.helpContentsLigoPluginSpecific);
@@ -37,7 +37,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that the ligo plugin aliases expose the correct info in the help menu', async () => {
+	test.skip('Verify that the ligo plugin aliases expose the correct info in the help menu', async () => {
 		try {
 			const ligoAliasCHelpContents = await exec(`taq c --help --projectDir=${taqueriaProjectPath}`);
 			expect(ligoAliasCHelpContents.stdout).toBe(contents.helpContentsLigoPluginSpecific);
@@ -51,7 +51,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that taqueria ligo plugin outputs no contracts message if no contracts exist', async () => {
+	test.skip('Verify that taqueria ligo plugin outputs no contracts message if no contracts exist', async () => {
 		try {
 			await exec(`taq compile`, { cwd: `./${taqueriaProjectPath}` });
 		} catch (error) {
@@ -59,7 +59,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that taqueria ligo plugin throw an error message if contract name is not specified', async () => {
+	test.skip('Verify that taqueria ligo plugin throw an error message if contract name is not specified', async () => {
 		try {
 			// 1. Copy contract from data folder to taqueria project folder
 			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
@@ -75,7 +75,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that taqueria ligo plugin can compile one contract using compile [sourceFile] command', async () => {
+	test.skip('Verify that taqueria ligo plugin can compile one contract using compile [sourceFile] command', async () => {
 		try {
 			// 1. Copy contract from data folder to taqueria project folder
 			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
@@ -114,7 +114,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that taqueria ligo plugin will display proper message if user tries to compile contract that does not exist', async () => {
+	test.skip('Verify that taqueria ligo plugin will display proper message if user tries to compile contract that does not exist', async () => {
 		try {
 			// 1. Run taq compile ${contractName} for contract that does not exist
 			const { stdout, stderr } = await exec(`taq compile test.mligo`, { cwd: `./${taqueriaProjectPath}` });
@@ -129,7 +129,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test('Verify that taqueria ligo plugin emits error and yet displays table if contract is invalid', async () => {
+	test.skip('Verify that taqueria ligo plugin emits error and yet displays table if contract is invalid', async () => {
 		try {
 			await exec(`cp e2e/data/invalid-contract.mligo ${taqueriaProjectPath}/contracts`);
 			await exec(`taq add-contract invalid-contract.mligo`, { cwd: `./${taqueriaProjectPath}` });
@@ -143,6 +143,46 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
+	// TODO:
+	test('Verify that taqueria ligo plugin can run ligo test using taq test <sourceFile> command', async () => {
+		try {
+			// 1. Copy contract  and tests files from data folder to taqueria project folder
+			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
+			await exec(`cp e2e/data/hello-tacos-tests.mligo ${taqueriaProjectPath}/contracts`);
+
+			// 2. Run taq test ${testFileName}
+			const { stdout, stderr } = await exec(`taq test hello-tacos-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
+			console.log(stdout);
+		} catch (error) {
+			throw new Error(`error: ${error}`);
+		}
+	});
+
+	// TODO:
+	test('Verify that taqueria ligo plugin will output proper error message running taq test <sourceFile> command against invalid test file', async () => {
+		try {
+			// 1. Copy contract  and tests files from data folder to taqueria project folder
+			await exec(`cp e2e/data/hello-tacos--invalid-tests.mligo ${taqueriaProjectPath}/contracts`);
+
+			// 2. Run taq test ${testFileName}
+			// const output =   await exec(`taq test hello-tacos-invalid-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
+			console.log(await exec(`taq test hello-tacos-invalid-tests.mligo`, { cwd: `./${taqueriaProjectPath}` }));
+		} catch (error) {
+			throw new Error(`error: ${error}`);
+		}
+	});
+
+	// TODO:
+	test('Verify that taqueria ligo plugin will output proper error message running taq test <sourceFile> command against non-existing file', async () => {
+		try {
+			// 1. Run taq test ${testFileName} against file that does not exist
+			const { stdout, stderr } = await exec(`taq test hello-tacos-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
+			console.log(stderr);
+		} catch (error) {
+			throw new Error(`error: ${error}`);
+		}
+	});
+
 	test.skip('Verify that the LIGO contract template is instantiated with the right content and registered', async () => {
 		try {
 			await exec(`taq create contract counter.mligo`, { cwd: `./${taqueriaProjectPath}` });

From c22e6d00bea6265dcb616c6d87c3473abefcbb00 Mon Sep 17 00:00:00 2001
From: Ivan Romanov <sinapsist@gmail.com>
Date: Tue, 20 Sep 2022 11:51:02 -0700
Subject: [PATCH 6/6] Added e2e tests

---
 tests/e2e/data/hello-tacos-tests.mligo        |  7 +-
 tests/e2e/taqueria-plugin-ligo.spec.ts        | 34 +++++-----
 ...ueria-plugin-multiple-test-plugins.spec.ts | 68 +++++++++++++++++++
 3 files changed, 88 insertions(+), 21 deletions(-)
 create mode 100644 tests/e2e/taqueria-plugin-multiple-test-plugins.spec.ts

diff --git a/tests/e2e/data/hello-tacos-tests.mligo b/tests/e2e/data/hello-tacos-tests.mligo
index cbb9393f1b..29f05fb962 100644
--- a/tests/e2e/data/hello-tacos-tests.mligo
+++ b/tests/e2e/data/hello-tacos-tests.mligo
@@ -7,7 +7,6 @@ let test_available_tacos =
  assert (Test.get_storage taddr = available_tacos)
 
 let test_buy_tacos =
- let (taddr, _, _) = Test.originate main available_tacos 100tez in
- let contr = Test.to_contract taddr in
- let _ = Test.transfer_to_contract_exn contr 1n in
- assert (Test.get_storage taddr = 100n)
\ No newline at end of file
+ let res = main(1n, available_tacos) in (* The nature of the contract we don't have entrypoints
+ // The only way to test it is to call function itself *)
+ assert (res.1 = 99n)
\ No newline at end of file
diff --git a/tests/e2e/taqueria-plugin-ligo.spec.ts b/tests/e2e/taqueria-plugin-ligo.spec.ts
index 86043d1aad..891d3966bf 100644
--- a/tests/e2e/taqueria-plugin-ligo.spec.ts
+++ b/tests/e2e/taqueria-plugin-ligo.spec.ts
@@ -19,7 +19,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		} catch (_) {}
 	});
 
-	test.skip('Verify that the ligo plugin exposes the associated commands in the help menu', async () => {
+	test('Verify that the ligo plugin exposes the associated commands in the help menu', async () => {
 		try {
 			const ligoHelpContents = await exec(`taq --help --projectDir=${taqueriaProjectPath}`);
 			expect(ligoHelpContents.stdout).toBe(contents.helpContentsLigoPlugin);
@@ -28,7 +28,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that the ligo plugin exposes the associated options in the help menu', async () => {
+	test('Verify that the ligo plugin exposes the associated options in the help menu', async () => {
 		try {
 			const ligoHelpContents = await exec(`taq compile --help --projectDir=${taqueriaProjectPath}`);
 			expect(ligoHelpContents.stdout).toBe(contents.helpContentsLigoPluginSpecific);
@@ -37,7 +37,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that the ligo plugin aliases expose the correct info in the help menu', async () => {
+	test('Verify that the ligo plugin aliases expose the correct info in the help menu', async () => {
 		try {
 			const ligoAliasCHelpContents = await exec(`taq c --help --projectDir=${taqueriaProjectPath}`);
 			expect(ligoAliasCHelpContents.stdout).toBe(contents.helpContentsLigoPluginSpecific);
@@ -51,7 +51,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that taqueria ligo plugin outputs no contracts message if no contracts exist', async () => {
+	test('Verify that taqueria ligo plugin outputs no contracts message if no contracts exist', async () => {
 		try {
 			await exec(`taq compile`, { cwd: `./${taqueriaProjectPath}` });
 		} catch (error) {
@@ -59,7 +59,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that taqueria ligo plugin throw an error message if contract name is not specified', async () => {
+	test('Verify that taqueria ligo plugin throw an error message if contract name is not specified', async () => {
 		try {
 			// 1. Copy contract from data folder to taqueria project folder
 			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
@@ -75,7 +75,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that taqueria ligo plugin can compile one contract using compile [sourceFile] command', async () => {
+	test('Verify that taqueria ligo plugin can compile one contract using compile [sourceFile] command', async () => {
 		try {
 			// 1. Copy contract from data folder to taqueria project folder
 			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
@@ -114,7 +114,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that taqueria ligo plugin will display proper message if user tries to compile contract that does not exist', async () => {
+	test('Verify that taqueria ligo plugin will display proper message if user tries to compile contract that does not exist', async () => {
 		try {
 			// 1. Run taq compile ${contractName} for contract that does not exist
 			const { stdout, stderr } = await exec(`taq compile test.mligo`, { cwd: `./${taqueriaProjectPath}` });
@@ -129,7 +129,7 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	test.skip('Verify that taqueria ligo plugin emits error and yet displays table if contract is invalid', async () => {
+	test('Verify that taqueria ligo plugin emits error and yet displays table if contract is invalid', async () => {
 		try {
 			await exec(`cp e2e/data/invalid-contract.mligo ${taqueriaProjectPath}/contracts`);
 			await exec(`taq add-contract invalid-contract.mligo`, { cwd: `./${taqueriaProjectPath}` });
@@ -143,41 +143,41 @@ describe('E2E Testing for taqueria ligo plugin', () => {
 		}
 	});
 
-	// TODO:
 	test('Verify that taqueria ligo plugin can run ligo test using taq test <sourceFile> command', async () => {
 		try {
 			// 1. Copy contract  and tests files from data folder to taqueria project folder
-			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
 			await exec(`cp e2e/data/hello-tacos-tests.mligo ${taqueriaProjectPath}/contracts`);
 
 			// 2. Run taq test ${testFileName}
 			const { stdout, stderr } = await exec(`taq test hello-tacos-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
-			console.log(stdout);
+			expect(stdout).toContain('All tests passed');
 		} catch (error) {
 			throw new Error(`error: ${error}`);
 		}
 	});
 
-	// TODO:
 	test('Verify that taqueria ligo plugin will output proper error message running taq test <sourceFile> command against invalid test file', async () => {
 		try {
 			// 1. Copy contract  and tests files from data folder to taqueria project folder
-			await exec(`cp e2e/data/hello-tacos--invalid-tests.mligo ${taqueriaProjectPath}/contracts`);
+			await exec(`cp e2e/data/hello-tacos-invalid-tests.mligo ${taqueriaProjectPath}/contracts`);
 
 			// 2. Run taq test ${testFileName}
 			// const output =   await exec(`taq test hello-tacos-invalid-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
-			console.log(await exec(`taq test hello-tacos-invalid-tests.mligo`, { cwd: `./${taqueriaProjectPath}` }));
+			const { stdout, stderr } = await exec(`taq test hello-tacos-invalid-tests.mligo`, {
+				cwd: `./${taqueriaProjectPath}`,
+			});
+			expect(stdout).toContain('Some tests failed :(');
+			expect(stderr).toContain('Variable "initial_storage" not found.');
 		} catch (error) {
 			throw new Error(`error: ${error}`);
 		}
 	});
 
-	// TODO:
 	test('Verify that taqueria ligo plugin will output proper error message running taq test <sourceFile> command against non-existing file', async () => {
 		try {
 			// 1. Run taq test ${testFileName} against file that does not exist
-			const { stdout, stderr } = await exec(`taq test hello-tacos-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
-			console.log(stderr);
+			const { stdout, stderr } = await exec(`taq test hello-tacos-test.mligo`, { cwd: `./${taqueriaProjectPath}` });
+			expect(stderr).toContain('contracts/hello-tacos-test.mligo: No such file or directory');
 		} catch (error) {
 			throw new Error(`error: ${error}`);
 		}
diff --git a/tests/e2e/taqueria-plugin-multiple-test-plugins.spec.ts b/tests/e2e/taqueria-plugin-multiple-test-plugins.spec.ts
new file mode 100644
index 0000000000..d41b4f839f
--- /dev/null
+++ b/tests/e2e/taqueria-plugin-multiple-test-plugins.spec.ts
@@ -0,0 +1,68 @@
+import { exec as exec1 } from 'child_process';
+import { createHash } from 'crypto';
+import fsPromises from 'fs/promises';
+import path from 'path';
+import util from 'util';
+import * as contents from './data/help-contents/ligo-contents';
+import { checkFolderExistsWithTimeout, generateTestProject } from './utils/utils';
+const exec = util.promisify(exec1);
+
+const taqueriaProjectPath = 'e2e/auto-test-multi-test-plugins';
+
+describe('E2E Testing for taqueria ligo plugin', () => {
+	beforeAll(async () => {
+		await generateTestProject(taqueriaProjectPath, ['ligo', 'jest']);
+		// TODO: This can removed after this is resolved:
+		// https://github.com/ecadlabs/taqueria/issues/528
+		try {
+			await exec(`taq -p ${taqueriaProjectPath}`);
+		} catch (_) {}
+	});
+
+	test('Verify that --plugin required to', async () => {
+		try {
+			// 1. Copy contract and tests files from data folder to taqueria project folder
+			await exec(`cp e2e/data/hello-tacos.mligo ${taqueriaProjectPath}/contracts`);
+			await exec(`cp e2e/data/hello-tacos-tests.mligo ${taqueriaProjectPath}/contracts`);
+
+			// 2. Run taq test ${testFileName}
+			await exec(`taq test hello-tacos-tests.mligo`, { cwd: `./${taqueriaProjectPath}` });
+		} catch (error) {
+			expect(String(error)).toContain('Missing required argument: plugin');
+		}
+	});
+
+	test('Verify that taqueria ligo plugin can run ligo test using taq test <sourceFile> command adding --plugin ligo to the command', async () => {
+		try {
+			// 2. Run taq test ${testFileName} with --plugin parameter
+			const { stdout, stderr } = await exec(`taq test hello-tacos-tests.mligo --plugin ligo`, {
+				cwd: `./${taqueriaProjectPath}`,
+			});
+			expect(stdout).toContain('All tests passed');
+		} catch (error) {
+			throw new Error(`error: ${error}`);
+		}
+	});
+
+	// Remove all files from artifacts folder without removing folder itself
+	afterEach(async () => {
+		try {
+			const files = await fsPromises.readdir(`${taqueriaProjectPath}/artifacts/`);
+			for (const file of files) {
+				await fsPromises.rm(path.join(`${taqueriaProjectPath}/artifacts/`, file));
+			}
+		} catch (error) {
+			throw new Error(`error: ${error}`);
+		}
+	});
+
+	// Clean up process to remove taquified project folder
+	// Comment if need to debug
+	afterAll(async () => {
+		try {
+			fsPromises.rm(taqueriaProjectPath, { recursive: true });
+		} catch (error) {
+			throw new Error(`error: ${error}`);
+		}
+	});
+});