feat: tests are running

EKOKE-DAO · Nov 8, 2023 · 94876f6 · 94876f6
1 parent cf8f9b5
commit 94876f6
Show file tree

Hide file tree

Showing 14 changed files with 228 additions and 212 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,12 +13,10 @@ version = "0.1.0"
 [workspace.dependencies]
 async-trait = "0.1"
 candid = "0.9"
-chrono = "0.4"
 ic-cdk = "0.11"
 ic-cdk-macros = "0.8"
 ic-stable-structures = "0.6"
 itertools = "0.11"
-log = "0.4"
 num-bigint = "0.4"
 serde = { version = "1", features = ["derive"] }
 thiserror = "1.0"

diff --git a/integration-tests/package.json b/integration-tests/package.json
@@ -7,14 +7,15 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test": "vitest"
+    "test": "vitest run"
   },
   "devDependencies": {
     "isomorphic-fetch": "^3.0.0",
     "vitest": "^0.34.6"
   },
   "dependencies": {
     "@dfinity/agent": "^0.19.3",
+    "@dfinity/candid": "^0.19.3",
     "@dfinity/principal": "^0.19.3"
   }
 }
diff --git a/integration-tests/tests/actor.js b/integration-tests/tests/actor.js
@@ -13,6 +13,6 @@ const createActor = async (canisterId, options) => {
   });
 };
 
-export const sellContract = await createActor(canisterIds.sell_contract, {
-  agentOptions: { host: "http://localhost:8000", fetch },
+export const sellContract = await createActor(canisterIds.sell_contract.local, {
+  agentOptions: { host: "http://localhost:4943", fetch },
 });
diff --git a/integration-tests/tests/sell_contract.test.js b/integration-tests/tests/sell_contract.test.js
@@ -1,7 +1,7 @@
 import { expect, test } from "vitest";
 import { Principal } from "@dfinity/principal";
 
-import { sellContract } from "./actor.js";
+import { sellContract } from "./actor";
 
 test("should be able to update fly canister principal", async () => {
   const principal = Principal.fromText("rrkah-fqaaa-aaaaa-aaaaq-cai");

diff --git a/integration-tests/yarn.lock b/integration-tests/yarn.lock
@@ -12,6 +12,11 @@
     borc "^2.1.1"
     simple-cbor "^0.4.1"
 
+"@dfinity/candid@^0.19.3":
+  version "0.19.3"
+  resolved "https://registry.yarnpkg.com/@dfinity/candid/-/candid-0.19.3.tgz#edc3491572d293824b821ce3a4fc50f5b4714f4d"
+  integrity sha512-yXfbLSWTeRd4G0bLLxYoDqpXH3Jim0P+1PPZOoktXNC1X1hB+ea3yrZebX75t4GVoQK7123F7mxWHiPjuV2tQQ==
+
 "@dfinity/principal@^0.19.3":
   version "0.19.3"
   resolved "https://registry.yarnpkg.com/@dfinity/principal/-/principal-0.19.3.tgz#428cfca3d2d2de9e1433b3b33498fd595fb441d8"

diff --git a/scripts/deploy_functions.sh b/scripts/deploy_functions.sh
@@ -18,6 +18,6 @@ deploy_sell_contract() {
     custodians = vec { principal \"$ADMIN_PRINCIPAL\" };
   })"
 
-  dfx canister install --mode=$INSTALL_MODE --yes --network="$NETWORK" --argument="$sell_contract_init_args" sell_contract
+  dfx deploy --mode=$INSTALL_MODE --yes --network="$NETWORK" --argument="$sell_contract_init_args" sell_contract
 
 }
diff --git a/scripts/dfx-test.sh b/scripts/dfx-test.sh
@@ -14,9 +14,11 @@ source ./deploy_functions.sh
 dfx stop
 dfx start --background
 
+cd ../
+
 deploy_sell_contract "reinstall" "local" "$SELL_CONTRACT_PRINCIPAL" "$FLY_PRINCIPAL" "$MARKETPLACE_PRINCIPAL" "$ADMIN_PRINCIPAL"
 
-cd ../integration-tests/
+cd ./integration-tests/
 
 yarn && yarn test
 RES=$?