create-near-app 4.0.0-beta.2.0 → 4.0.0-beta.3.0

package/dist/make.js

@@ -59,18 +59,20 @@ async function createFiles({ contract, frontend, tests, projectPath, verbose, ro
         verbose,
         skip: skip.map(f => path_1.default.join(contractSourceDir, f))
     });
-    // copy tests
-    let sourceTestDir = `${rootDir}/integration-tests`;
-    if (tests === 'js') {
-        sourceTestDir = path_1.default.resolve(sourceTestDir, 'workspaces-tests/ts');
-    }
-    else {
-        sourceTestDir = path_1.default.resolve(sourceTestDir, 'workspaces-tests/rs');
-    }
-    await copyDir(sourceTestDir, `${projectPath}/integration-tests/`, {
+    // copy tests - shared files
+    let sourceTestSharedDir = path_1.default.resolve(`${rootDir}/integration-tests/shared/${tests}-tests`);
+    await copyDir(sourceTestSharedDir, `${projectPath}/integration-tests/`, {
         verbose,
-        skip: skip.map(f => path_1.default.join(sourceTestDir, f))
+        skip: skip.map(f => path_1.default.join(sourceTestSharedDir, f))
     });
+    // copy tests - overrides files
+    let sourceTestOverridesDir = path_1.default.resolve(`${rootDir}/integration-tests/overrides/${contract}-contract/${tests}-tests`);
+    if (fs_1.default.existsSync(sourceTestOverridesDir)) {
+        await copyDir(sourceTestOverridesDir, `${projectPath}/integration-tests/`, {
+            verbose,
+            skip: skip.map(f => path_1.default.join(sourceTestOverridesDir, f))
+        });
+    }
     // add .gitignore
     await (0, exports.renameFile)(`${projectPath}/near.gitignore`, `${projectPath}/.gitignore`);
 }

package/dist/package-json.js

@@ -99,7 +99,7 @@ const integrationTestScripts = (contract, tests) => {
         case 'js':
             if (tests === 'js') {
                 return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && npm test  -- -- "./contract/build/hello_near.wasm" "js"',
+                    'test:integration': 'npm run build:contract && cd integration-tests && npm test  -- -- "./contract/build/hello_near.wasm"',
                 };
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-near-app",
-  "version": "4.0.0-beta.2.0",
+  "version": "4.0.0-beta.3.0",
   "description": "Quickly scaffold your dApp on NEAR Blockchain",
   "main": "index.js",
   "engines": {

package/templates/contracts/js/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "near-cli": "^3.4.0",
-    "near-sdk-js": "0.4.0-3"
+    "near-sdk-js": "0.4.0-4"
   },
   "devDependencies": {
     "typescript": "^4.7.4"

package/templates/integration-tests/{workspaces-tests/ts → overrides/js-contract/js-tests}/src/main.ava.ts

@@ -17,12 +17,8 @@ test.beforeEach(async (t) => {
   await contract.deploy(
     process.argv[2],
   );
-  if (process.argv[3] === 'js') {
-    // JavaScript contracts require calling 'init' function upon deployment
-    // We pass this parameter in process.argv only for convenience of create-near-app
-    // Rust contracts don't require 'init'
-    await contract.call(contract, 'init', {});
-  }
+  // JavaScript contracts require calling 'init' function upon deployment
+  await contract.call(contract, 'init', {});
 
   // Save state for test runs, it is unique for each test
   t.context.worker = worker;

package/templates/integration-tests/overrides/js-contract/rust-tests/src/tests.rs

@@ -0,0 +1,74 @@
+use std::{env, fs};
+use near_units::parse_near;
+use serde_json::json;
+use workspaces::prelude::*;
+use workspaces::{network::Sandbox, Account, Contract, Worker};
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    let wasm_arg: &str = &(env::args().nth(1).unwrap());
+    let wasm_filepath = fs::canonicalize(env::current_dir()?.join(wasm_arg))?;
+
+    let worker = workspaces::sandbox().await?;
+    let wasm = std::fs::read(wasm_filepath)?;
+    let contract = worker.dev_deploy(&wasm).await?;
+
+    // create accounts
+    let account = worker.dev_create_account().await?;
+    let alice = account
+        .create_subaccount(&worker, "alice")
+        .initial_balance(parse_near!("30 N"))
+        .transact()
+        .await?
+        .into_result()?;
+
+    // js contracts need to be initialized
+    contract
+        .call(&worker, "init")
+        .transact()
+        .await?;
+
+    // begin tests
+    test_default_message(&alice, &contract, &worker).await?;
+    test_changes_message(&alice, &contract, &worker).await?;
+    Ok(())
+}
+
+async fn test_default_message(
+    user: &Account,
+    contract: &Contract,
+    worker: &Worker<Sandbox>,
+) -> anyhow::Result<()> {
+    let message: String = user
+        .call(&worker, contract.id(), "get_greeting")
+        .args_json(json!({}))?
+        .transact()
+        .await?
+        .json()?;
+
+    assert_eq!(message, "Hello".to_string());
+    println!("      Passed ✅ gets default message");
+    Ok(())
+}
+
+async fn test_changes_message(
+    user: &Account,
+    contract: &Contract,
+    worker: &Worker<Sandbox>,
+) -> anyhow::Result<()> {
+    user.call(&worker, contract.id(), "set_greeting")
+        .args_json(json!({"message": "Howdy"}))?
+        .transact()
+        .await?;
+
+    let message: String = user
+        .call(&worker, contract.id(), "get_greeting")
+        .args_json(json!({}))?
+        .transact()
+        .await?
+        .json()?;
+
+    assert_eq!(message, "Howdy".to_string());
+    println!("      Passed ✅ changes message");
+    Ok(())
+}

package/templates/integration-tests/shared/js-tests/src/main.ava.ts

@@ -0,0 +1,44 @@
+import { Worker, NEAR, NearAccount } from 'near-workspaces';
+import anyTest, { TestFn } from 'ava';
+
+const test = anyTest as TestFn<{
+  worker: Worker;
+  accounts: Record<string, NearAccount>;
+}>;
+
+test.beforeEach(async (t) => {
+  // Init the worker and start a Sandbox server
+  const worker = await Worker.init();
+
+  // Deploy contract
+  const root = worker.rootAccount;
+  const contract = await root.createSubAccount('test-account');
+  // Get wasm file path from package.json test script in folder above
+  await contract.deploy(
+    process.argv[2],
+  );
+
+  // Save state for test runs, it is unique for each test
+  t.context.worker = worker;
+  t.context.accounts = { root, contract };
+});
+
+test.afterEach(async (t) => {
+  // Stop Sandbox server
+  await t.context.worker.tearDown().catch((error) => {
+    console.log('Failed to stop the Sandbox:', error);
+  });
+});
+
+test('returns the default greeting', async (t) => {
+  const { contract } = t.context.accounts;
+  const message: string = await contract.view('get_greeting', {});
+  t.is(message, 'Hello');
+});
+
+test('changes the message', async (t) => {
+  const { root, contract } = t.context.accounts;
+  await root.call(contract, 'set_greeting', { message: 'Howdy' });
+  const message: string = await contract.view('get_greeting', {});
+  t.is(message, 'Howdy');
+});

package/templates/integration-tests/{workspaces-tests/rs → shared/rust-tests}/Cargo.toml

@@ -14,7 +14,7 @@ serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 tokio = { version = "1.18.1", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
-workspaces = "0.2.1"
+workspaces = "0.4.0"
 pkg-config = "0.3.1"
 
 [[example]]

package/templates/integration-tests/{workspaces-tests/rs → shared/rust-tests}/src/tests.rs

@@ -14,8 +14,8 @@ async fn main() -> anyhow::Result<()> {
     let contract = worker.dev_deploy(&wasm).await?;
 
     // create accounts
-    let owner = worker.root_account();
-    let alice = owner
+    let account = worker.dev_create_account().await?;
+    let alice = account
         .create_subaccount(&worker, "alice")
         .initial_balance(parse_near!("30 N"))
         .transact()

package/templates/integration-tests/classic-tests/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "ava-testing",
-  "version": "1.0.0",
-  "license": "(MIT AND Apache-2.0)",
-  "scripts": {
-    "test": "ava"
-  },
-  "devDependencies": {
-    "@types/bn.js": "^5.1.0",
-    "@types/node": "^18.6.2",
-    "ava": "^4.2.0",
-    "near-api-js": "^0.44.2",
-    "ts-node": "^10.8.0",
-    "typescript": "^4.7.2"
-  },
-  "dependencies": {}
-}

package/templates/integration-tests/classic-tests/src/config.ts

@@ -1,34 +0,0 @@
-import {KeyPair, keyStores} from 'near-api-js';
-
-const fs = require('fs');
-const path = require('path');
-
-// first make sure you deployed your contract with dev-deploy, see ../package.json deploy script
-// here we take the contract from the auto-generated neardev folder
-const CONTRACT_NAME = fs.readFileSync(path.resolve(__dirname, '../../contract/neardev/dev-account'), 'utf-8');
-const NETWORK_ID = 'testnet';
-
-// Create an InMemoryKeyStore
-const keyStore = new keyStores.InMemoryKeyStore();
-
-// Load credentials
-const credPath = `${process.env.HOME}/.near-credentials/${NETWORK_ID}/${CONTRACT_NAME}.json`;
-let credentials = JSON.parse(fs.readFileSync(credPath));
-
-// Save key in the key store
-keyStore.setKey(
-  NETWORK_ID,
-  CONTRACT_NAME,
-  KeyPair.fromString(credentials.private_key)
-);
-
-export const nearConfig = {
-  networkId: NETWORK_ID,
-  nodeUrl: 'https://rpc.testnet.near.org',
-  contractName: CONTRACT_NAME,
-  walletUrl: 'https://wallet.testnet.near.org',
-  helperUrl: 'https://helper.testnet.near.org',
-  explorerUrl: 'https://explorer.testnet.near.org',
-  headers: {},
-  deps: {keyStore}
-};

package/templates/integration-tests/classic-tests/src/main.ava.ts

@@ -1,32 +0,0 @@
-import anyTest, { TestFn } from 'ava';
-
-import { Near, Account, Contract } from 'near-api-js';
-import { nearConfig } from './config';
-
-const test = anyTest as TestFn<{
-  accounts: Record<string, any>;
-}>;
-
-test.beforeEach(async (t) => {
-  const near = await new Near(nearConfig);
-  const user = await new Account(near.connection, nearConfig.contractName);
-  const contract = await new Contract(
-    user,
-    nearConfig.contractName,
-    { viewMethods: ['get_greeting'], changeMethods: ['set_greeting'] }
-  );
-  t.context.accounts = { contract };
-});
-
-test('returns the default greeting', async (t) => {
-  const { contract } = t.context.accounts;
-  const message: string = await contract.get_greeting({});
-  t.is(message, 'Hello');
-});
-
-test('changes the message', async (t) => {
-  const { contract } = t.context.accounts;
-  await contract.set_greeting({args:{ message: 'Howdy' }});
-  const message: string = await contract.get_greeting({});
-  t.is(message, 'Howdy');
-});

package/templates/integration-tests/workspaces-tests/ts/ava.config.cjs

@@ -1,9 +0,0 @@
-require("util").inspect.defaultOptions.depth = 5; // Increase AVA's printing depth
-
-module.exports = {
-  timeout: "300000",
-  files: ["src/*.ava.ts"],
-  failWithoutAssertions: false,
-  extensions: ["ts"],
-  require: ["ts-node/register"],
-};