tests: refactor integration tests (#4249)

* tests: sort alphabetically deps in Cargo.toml

* tests: move common/ up a level

In preparation to splitting tests/integration-tests/ into 2 directories,
we want common/ to be easily accessible from both, so I'm moving it up a
level.

* tests: new .gitignore

* tests: isolate integration and runner tests

* tests: refactor and make tests run faster

Author: neysofu

.gitignore

@@ -20,12 +20,11 @@ lcov.info
 /docker/parity/network/
 **/*/tests/fixtures/ipfs_folder/random.txt
 
-/tests/integration-tests/**/build
-/tests/integration-tests/**/generated
-/tests/integration-tests/**/node_modules
-/tests/integration-tests/**/yarn.lock
-/tests/integration-tests/**/yarn-error.log
+/tests/**/build
+/tests/**/generated
+/tests/**/node_modules
+/tests/**/yarn-error.log
 
 # Built solidity contracts.
-/tests/integration-tests/**/bin
-/tests/integration-tests/**/truffle_output
+/tests/**/bin
+/tests/**/truffle_output

Cargo.lock

@@ -4,31 +4,31 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-port_check = "0.1.5"
 anyhow = "1.0"
+assert-json-diff = "2.0.2"
+async-stream = "0.3.3"
+bollard = "0.10"
 futures = { version = "0.3", features = ["compat"] }
 graph = { path = "../graph" }
-tokio = { version = "1.16.1", features = ["rt", "macros", "process"] }
 graph-chain-ethereum = { path = "../chain/ethereum" }
-async-stream = "0.3.3"
 graph-node = { path = "../node" }
 graph-core = { path = "../core" }
 graph-mock = { path = "../mock" }
 graph-graphql = { path = "../graphql" }
 graph-store-postgres = { path = "../store/postgres" }
 graph-runtime-wasm = { path = "../runtime/wasm" }
 graph-server-index-node = { path = "../server/index-node" }
-slog = { version = "2.7.0", features = ["release_max_level_trace", "max_level_trace"] }
 graphql-parser = "0.4.0"
-hex = "0.4.3"
-serde_yaml = "0.8"
 hyper = "0.14"
 serde = "1.0"
-assert-json-diff = "2.0.2"
+serde_yaml = "0.8"
+slog = { version = "2.7.0", features = ["release_max_level_trace", "max_level_trace"] }
+tokio = { version = "1.16.1", features = ["rt", "macros", "process"] }
+uuid = { version = "1.2.2", features = ["v4"] }
 
 [dev-dependencies]
-bollard = "0.10"
 anyhow = "1.0.69"
+bollard = "0.10"
 lazy_static = "1.4.0"
 tokio-stream = "0.1"
 serde_yaml = "0.8"

tests/Cargo.toml

@@ -2,7 +2,7 @@
   "name": "api-version-v0-0-4",
   "version": "0.1.0",
   "scripts": {
-    "build-contracts": "../common/build-contracts.sh",
+    "build-contracts": "../../common/build-contracts.sh",
     "codegen": "graph codegen --skip-migrations",
     "test": "yarn build-contracts && truffle test --compile-none --network test",
     "create:test": "graph create test/api-version-v0-0-4 --node $GRAPH_NODE_ADMIN_URI",

tests/integration-tests/common/1_initial_migration.js renamed to tests/common/1_initial_migration.js

@@ -2,8 +2,8 @@ require("babel-register");
 require("babel-polyfill");
 
 module.exports = {
-  contracts_directory: "../common",
-  migrations_directory: "../common",
+  contracts_directory: "../../common",
+  migrations_directory: "../../common",
   contracts_build_directory: "./truffle_output",
   networks: {
     test: {