Skip to content

Commit

Permalink
renamed directory test
Browse files Browse the repository at this point in the history
  • Loading branch information
silkroadnomad committed Nov 14, 2018
1 parent 42f077d commit eb5295e
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Treat all text files without a CR (as we have Docker)
* text eol=lf
#* text eol=lf
Binary file added doc/Doichain-WhitePaper.odt
Binary file not shown.
Binary file added doc/Doichain-WhitePaper.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion docker-compose-test-regtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ services:
#build: .
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
#- ".:/home/doichain/dapp" #TODO you can enable this during development but not during testing in CI (permission denided)
- ".:/home/doichain/dapp" #TODO you can enable this during development but not during testing in CI (permission denided)
dns:
- 172.20.0.5
- 8.8.8.8
Expand Down
8 changes: 6 additions & 2 deletions tests/0-basic-doi-test.0.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ import {
} from "./test-api/test-api-on-node";
import {logBlockchain} from "../imports/startup/server/log-configuration";

const node_url_alice = 'http://172.20.0.6:18332/';
const node_url_bob = 'http://172.20.0.7:18332/';
//const node_url_alice = 'http://172.20.0.6:18332/';
//const node_url_bob = 'http://172.20.0.7:18332/';

const node_url_alice = 'http://le-space.de:18332/';
const node_url_bob = 'http://explorer.doichain.org:18332/';

const rpcAuth = "admin:generated-password";
const privKeyBob = "cP3EigkzsWuyKEmxk8cC6qXYb4ZjwUo5vzvZpAPmDQ83RCgXQruj";

Expand Down
7 changes: 5 additions & 2 deletions tests/1-basic-doi-test.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import {
} from "./test-api/test-api-on-dapp";
import {logBlockchain} from "../imports/startup/server/log-configuration";

const node_url_alice = 'http://172.20.0.6:18332/';
//const node_url_alice = 'http://172.20.0.6:18332/';
const node_url_alice = 'http://le-space.de:18332/';
const node_url_bob = 'http://explorer.doichain.org:18332/';

const rpcAuthAlice = "admin:generated-password";
const dappUrlAlice = "http://localhost:3000";
const dappUrlBob = "http://172.20.0.8:4000";
Expand Down Expand Up @@ -54,7 +57,7 @@ describe('basic-doi-test-01', function () {
done();
});

xit('should test if Doichain workflow is using different templates for different users', function (done) {
it('should test if Doichain workflow is using different templates for different users', function (done) {
resetUsers();
const recipient_mail = "bob@ci-doichain.org"; //
const sender_mail_alice_a = "alice-a@ci-doichain.org";
Expand Down
4 changes: 3 additions & 1 deletion tests/2-basic-doi-test.2.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ import {
} from "./test-api/test-api-on-node";
const exec = require('child_process').exec;

const node_url_alice = 'http://le-space.de:18332/';
//const node_url_alice = 'http://172.20.0.6:18332/';
const recipient_pop3username = "bob@ci-doichain.org";
const recipient_pop3password = "bob";
const node_url_alice = 'http://172.20.0.6:18332/';

const rpcAuth = "admin:generated-password";
const dappUrlAlice = "http://localhost:3000";
const dappUrlBob = "http://172.20.0.8:4000";
Expand Down
2 changes: 1 addition & 1 deletion tests/3-basic-doi-test.3.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const dAppLogin = {"username":"admin","password":"password"};
const recipient_pop3username = "bob@ci-doichain.org";
const recipient_pop3password = "bob";

describe('basic-doi-test-03', function () {
xdescribe('basic-doi-test-03', function () {

before(function(){
logBlockchain("removing OptIns,Recipients,Senders");
Expand Down

0 comments on commit eb5295e

Please sign in to comment.