Move testkit-server into a separate crate (exonum#718)

torwig · Jun 1, 2018 · 9f29d54 · 9f29d54
1 parent 473d124
commit 9f29d54
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -81,6 +81,7 @@ jobs:
     - ./node_modules/.bin/cspell exonum/{src,benches,tests}/**/*.rs
     - ./node_modules/.bin/cspell exonum/fuzz/fuzz_targets/*.rs
     - ./node_modules/.bin/cspell testkit/{src,examples,tests}/**/*.rs
+    - ./node_modules/.bin/cspell testkit/server/{src,examples,tests}/**/*.rs
     - ./node_modules/.bin/cspell services/configuration/{src,examples}/**/*.rs
     - ./node_modules/.bin/cspell services/time/{src,examples,tests}/**/*.rs
     - ./node_modules/.bin/cspell examples/cryptocurrency/{src,examples,tests}/**/*.rs
@@ -130,7 +131,7 @@ jobs:
         - powershell
     install:
     - nvm install 8 && nvm use 8
-    - cd $TRAVIS_BUILD_DIR/testkit/examples/server && npm install && cd $TRAVIS_BUILD_DIR
+    - cd $TRAVIS_BUILD_DIR/testkit/server/src && npm install && cd $TRAVIS_BUILD_DIR
     script:
     - cargo test --all
     - cargo run -p exonum --example explorer
@@ -139,7 +140,7 @@ jobs:
     - cargo run -p exonum-time --example simple_service
     - cd $TRAVIS_BUILD_DIR/examples/cryptocurrency/examples && ./test.sh
     - cd $TRAVIS_BUILD_DIR/examples/cryptocurrency/examples && ./test.ps1
-    - cd $TRAVIS_BUILD_DIR/testkit/examples/server && npm run test:unix
+    - cd $TRAVIS_BUILD_DIR/testkit/server/src && npm run test:unix
 
   # Benchmarks (compilation only)
   - env: FEATURE=benchmarks

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 members = [
     "exonum",
     "testkit",
+    "testkit/server",
     "services/configuration",
     "services/time",
     "examples/cryptocurrency",

diff --git a/examples/cryptocurrency-advanced/backend/Cargo.toml b/examples/cryptocurrency-advanced/backend/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/exonum/exonum"
 readme = "README.md"
 license = "Apache-2.0"
 keywords = ["exonum", "blockchain", "example"]
-categories = ["rust-patterns"]
+categories = ["rust-patterns", "development-tools::testing"]
 description = "Exonum blockchain example implementing a cryptocurrency."
 
 [badges]

diff --git a/examples/cryptocurrency/Cargo.toml b/examples/cryptocurrency/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "exonum-cryptocurrency"
-version = "0.8.0"
+publish = false
+version = "0.0.0"
 authors = ["The Exonum Team <exonum@bitfury.com>"]
 homepage = "https://exonum.com/"
 repository = "https://github.com/exonum/exonum"

diff --git a/testkit/Cargo.toml b/testkit/Cargo.toml
@@ -3,7 +3,7 @@ name = "exonum-testkit"
 version = "0.8.0"
 authors = ["The Exonum Team <exonum@bitfury.com>"]
 homepage = "https://exonum.com/"
-repository = "https://github.com/exonum/exonum-testkit"
+repository = "https://github.com/exonum/exonum"
 documentation = "https://docs.rs/exonum-testkit"
 readme = "README.md"
 license = "Apache-2.0"
@@ -33,7 +33,6 @@ tokio-core = "=0.1.17"
 router = "=0.6.0"
 
 [dev-dependencies]
-exonum-cryptocurrency = { version = "0.8.0", path = "../examples/cryptocurrency" }
 rand = "=0.4.2"
 pretty_assertions = "=0.5.1"
 assert_matches = "1.2.0"

diff --git a/testkit/server/Cargo.toml b/testkit/server/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "exonum-testkit-server"
+publish = false
+version = "0.0.0"
+authors = ["The Exonum Team <exonum@bitfury.com>"]
+homepage = "https://exonum.com/"
+repository = "https://github.com/exonum/exonum"
+documentation = "https://docs.rs/exonum-testkit"
+readme = "README.md"
+license = "Apache-2.0"
+keywords = ["test", "blockchain", "framework", "exonum"]
+categories = ["development-tools::testing"]
+description = "This example demonstrates how to use the testkit together with client-side testing."
+
+[badges]
+travis-ci = { repository = "exonum/exonum" }
+circle-ci = { repository = "exonum/exonum" }
+
+[dependencies]
+exonum = { version = "0.8.0", path = "../../exonum" }
+exonum-testkit = { version = "0.8.0", path = ".." }
+exonum-cryptocurrency = { version = "0.0.0", path = "../../examples/cryptocurrency" }
diff --git a/testkit/examples/server/README.md → testkit/server/README.md b/testkit/examples/server/README.md → testkit/server/README.md
diff --git a/testkit/examples/server/package-lock.json → testkit/server/package-lock.json b/testkit/examples/server/package-lock.json → testkit/server/package-lock.json
diff --git a/testkit/examples/server/package.json → testkit/server/package.json b/testkit/examples/server/package.json → testkit/server/package.json
@@ -2,16 +2,16 @@
   "name": "testkit-server",
   "version": "0.0.0",
   "description": "Client-side testkit-based service testing",
-  "main": "index.js",
+  "main": "test/index.js",
   "engines": {
     "node": ">=8"
   },
   "private": true,
   "scripts": {
     "lint": "standard",
-    "pretest:unix": "npm run posttest:unix && cargo run --example server & sleep 10",
-    "test": "mocha index.js",
-    "test:unix": "mocha index.js",
+    "pretest:unix": "npm run posttest:unix && cargo run & sleep 10",
+    "test": "mocha test/index.js",
+    "test:unix": "mocha test/index.js",
     "posttest:unix": "lsof -iTCP -sTCP:LISTEN -n -P 2>/dev/null | awk '{ if ($9 == \"*:8000\") { print $2 } }' | xargs -r kill -KILL"
   },
   "repository": {

diff --git a/testkit/examples/server/main.rs → testkit/server/src/main.rs b/testkit/examples/server/main.rs → testkit/server/src/main.rs
diff --git a/testkit/examples/server/index.js → testkit/server/test/index.js b/testkit/examples/server/index.js → testkit/server/test/index.js
diff --git a/testkit/examples/server/service.js → testkit/server/test/service.js b/testkit/examples/server/service.js → testkit/server/test/service.js
diff --git a/testkit/examples/server/testkit.js → testkit/server/test/testkit.js b/testkit/examples/server/testkit.js → testkit/server/test/testkit.js