From d28857d282bb17fb786a71e30e530021ede9b320 Mon Sep 17 00:00:00 2001
From: garikbesson <garikbesson@gmail.com>
Date: Tue, 29 Oct 2024 16:06:46 +0100
Subject: [PATCH] fix workflow tests

---
 .github/dependabot.yml                 | 16 ------
 .github/scripts/readme-quick-deploy.sh | 73 --------------------------
 .github/workflows/readme-ci.yml        | 27 ----------
 .github/workflows/tests.yml            | 32 +++--------
 4 files changed, 6 insertions(+), 142 deletions(-)
 delete mode 100644 .github/dependabot.yml
 delete mode 100755 .github/scripts/readme-quick-deploy.sh
 delete mode 100755 .github/workflows/readme-ci.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 7df4ff03..00000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: cargo
-  directory: "/contracts/rust"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: near-sdk
-    versions:
-    - 3.0.1
diff --git a/.github/scripts/readme-quick-deploy.sh b/.github/scripts/readme-quick-deploy.sh
deleted file mode 100755
index 75fba2bf..00000000
--- a/.github/scripts/readme-quick-deploy.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-echo ==== Quick Deploy ====
-TEXT=$(printf 'y\n' | near dev-deploy --wasmFile res/non_fungible_token.wasm)
-if [[ ! "$TEXT" =~ .*"Done deploying to".* ]]; then 
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== Set dev account env variable ====
-source neardev/dev-account.env
-TEXT=$(echo $CONTRACT_NAME)
-if [[ ! "$TEXT" =~ .*"dev-".* ]]; then 
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== Initialize contract using the new method ====
-TEXT=$(near call $CONTRACT_NAME new_default_meta '{"owner_id": "'$CONTRACT_NAME'"}' --accountId $CONTRACT_NAME)
-if [[ ! "$TEXT" =~ .*"To see the transaction in the transaction explorer".* ]]; then 
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== View contract metadata ====
-TEXT=$(near view $CONTRACT_NAME nft_metadata)
-if [[ ! "$TEXT" =~ .*"Example NEAR non-fungible token".* ]]; then 
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== Mint NFT ==== 
-TEXT=$(near call $CONTRACT_NAME nft_mint '{"token_id": "0", "receiver_id": "'$CONTRACT_NAME'", "token_metadata": { "title": "Olympus Mons", "description": "Tallest mountain in charted solar system", "media": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/00/Olympus_Mons_alt.jpg/1024px-Olympus_Mons_alt.jpg", "copies": 1}}' --accountId $CONTRACT_NAME --deposit 0.1)
-if [[ ! "$TEXT" =~ .*"To see the transaction in the transaction explorer, please open this url in your browser".* ]]; then
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== Create Sub Account ====
-TEXT=$(near create-account alice.$CONTRACT_NAME --masterAccount $CONTRACT_NAME --initialBalance 10)
-if [[ ! "$TEXT" =~ .*"Account alice.$CONTRACT_NAME for network".* ]]; then
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== Check Sub Account for Tokens ====
-TEXT=$(near view $CONTRACT_NAME nft_tokens_for_owner '{"account_id": "'alice.$CONTRACT_NAME'"}')
-if [[ ! "$TEXT" =~ .*"[]".* ]]; then
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
-
-echo ==== Transfer NFT ====
-TEXT=$(near call $CONTRACT_NAME nft_transfer '{"token_id": "0", "receiver_id": "alice.'$CONTRACT_NAME'", "memo": "transfer ownership"}' --accountId $CONTRACT_NAME --depositYocto 1)
-if [[ ! "$TEXT" =~ .*"To see the transaction in the transaction explorer, please open this url in your browser".* ]]; then
-    echo -e "\033[0;31m FAIL \033[0m"
-    exit 1 
-else 
-    echo -e "\033[0;32m SUCCESS \033[0m"
-fi
diff --git a/.github/workflows/readme-ci.yml b/.github/workflows/readme-ci.yml
deleted file mode 100755
index dea9dfa2..00000000
--- a/.github/workflows/readme-ci.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Readme CI
-on:
-  repository_dispatch:
-    types: [tests-report]
-  push:
-jobs:
-  readme-ci:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest] # mac-os lags out
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout branch
-        uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v2
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: wasm32-unknown-unknown
-      - name: Install NEAR CLI
-        run: npm install near-cli -g
-      - name: Building this contract
-        run: bash ./scripts/build.sh
-      - name: Run Readme Quick Deploy Commands
-        run: bash .github/scripts/readme-quick-deploy.sh
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c0baaa07..85998637 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,33 +1,13 @@
 name: Tests
-on: 
-  repository_dispatch:
-    types: [tests-report]
-  push:
+on: push
 jobs:
   tests:
     strategy:
       matrix:
-        platform: [ubuntu-latest]  # mac-os currently in progress
+        platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Checkout branch
-        uses: actions/checkout@v2
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: wasm32-unknown-unknown
-      - name: Build wasm files
-        run: source scripts/flags.sh && rustup target add wasm32-unknown-unknown && cargo build --all --target wasm32-unknown-unknown --release && cp target/wasm32-unknown-unknown/release/*.wasm ./res/
-      - name: Run unit tests
-        env:
-          IS_GITHUB_ACTION: true
-        run: cd nft && cargo test -- --nocapture --color=always
-      - name: Run Rust integration tests
-        run: cd integration-tests/rs && cargo run --example integration-tests
-      - name: Run TypeScript integration tests
-        run: cd integration-tests/ts && npm i && npm run test 
+      - uses: actions/checkout@v4
+      - name: Install and test modules
+        run: |
+          cargo test