From acf091cb78ac50ecf341ab29a790d875bd0be247 Mon Sep 17 00:00:00 2001 From: robertdurst Date: Mon, 4 Jun 2018 21:14:30 -0700 Subject: [PATCH] Cleanup extra code in tests --- src/call_builder.js | 2 -- test/unit/federation_server_test.js | 47 +++++++++---------------- test/unit/stellar_toml_resolver_test.js | 15 +++----- 3 files changed, 21 insertions(+), 43 deletions(-) diff --git a/src/call_builder.js b/src/call_builder.js index 2974e7537..aaead637c 100644 --- a/src/call_builder.js +++ b/src/call_builder.js @@ -1,6 +1,5 @@ import {NotFoundError, NetworkError, BadRequestError} from "./errors"; import forEach from 'lodash/forEach'; -import { Config } from "./config"; let URI = require("urijs"); let URITemplate = require("urijs/src/URITemplate"); @@ -18,7 +17,6 @@ let toBluebird = require("bluebird").resolve; */ export class CallBuilder { constructor(serverUrl) { - this.url = serverUrl; this.filter = []; this.originalSegments = this.url.segment() || []; diff --git a/test/unit/federation_server_test.js b/test/unit/federation_server_test.js index 4a2917842..af866ea21 100644 --- a/test/unit/federation_server_test.js +++ b/test/unit/federation_server_test.js @@ -230,21 +230,17 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }); - describe('FederationServer timeout', function () { - - it("times out when resolveAddress response lags", function (done) { + describe('FederationServer times out when response lags and timeout set', function () { + it("resolveAddress times out", function (done) { StellarSdk.Config.setTimeout(100); // Unable to create temp server in a browser if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.FEDERATION_RESPONSE_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - res.setHeader('Content-Type', 'application/json; charset=UTF-8'); - setTimeout(() => { - res.end(response); - }, 10000); + setTimeout(() => {}, 10000); }).listen(4444, () => { new StellarSdk.FederationServer('http://localhost:4444/federation', 'stellar.org', {allowHttp: true}) .resolveAddress('bob*stellar.org') @@ -254,19 +250,16 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }); }); - it("times out when resolveAccountId response lags", function (done) { + it("resolveAccountId times out", function (done) { StellarSdk.Config.setTimeout(100); // Unable to create temp server in a browser if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.FEDERATION_RESPONSE_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - res.setHeader('Content-Type', 'application/json; charset=UTF-8'); - setTimeout(() => { - res.end(response); - }, 10000); + setTimeout(() => {}, 10000); }).listen(4444, () => { new StellarSdk.FederationServer('http://localhost:4444/federation', 'stellar.org', {allowHttp: true}) .resolveAccountId('GB5XVAABEQMY63WTHDQ5RXADGYF345VWMNPTN2GFUDZT57D57ZQTJ7PS') @@ -276,19 +269,16 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }); }); - it("times out when resolveTransactionId response lags", function (done) { + it("resolveTransactionId times out", function (done) { StellarSdk.Config.setTimeout(100); // Unable to create temp server in a browser if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.FEDERATION_RESPONSE_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - res.setHeader('Content-Type', 'application/json; charset=UTF-8'); - setTimeout(() => { - res.end(response); - }, 10000); + setTimeout(() => {}, 10000); }).listen(4444, () => { new StellarSdk.FederationServer('http://localhost:4444/federation', 'stellar.org', {allowHttp: true}) .resolveTransactionId('3389e9f0f1a65f19736cacf544c2e825313e8447f569233bb8db39aa607c8889') @@ -298,17 +288,14 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }); }); - it("times out when createForDomain response lags", function (done) { + it("createForDomain times out", function (done) { // Unable to create temp server in a browser if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.STELLAR_TOML_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - setTimeout(() => { - res.setHeader('Content-Type', 'text/x-toml; charset=UTF-8'); - res.end(response); - }, 1000); + setTimeout(() => {}, 1000); }).listen(4444, () => { StellarSdk.FederationServer.createForDomain("localhost:4444", {allowHttp: true, timeout: 100}) .should.be.rejectedWith(/timeout of 100ms exceeded/) @@ -317,16 +304,14 @@ FEDERATION_SERVER="https://api.stellar.org/federation" }); }); - it("times out when resolve response lags", function (done) { + it("resolve times out", function (done) { // Unable to create temp server in a browser if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.FEDERATION_RESPONSE_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - setTimeout(() => { - res.end(response); - }, 10000); + setTimeout(() => {}, 10000); }).listen(4444, () => { StellarSdk.FederationServer .resolve('bob*localhost:4444', {allowHttp: true, timeout: 100}) diff --git a/test/unit/stellar_toml_resolver_test.js b/test/unit/stellar_toml_resolver_test.js index bb7214b0f..cfa3b82bf 100644 --- a/test/unit/stellar_toml_resolver_test.js +++ b/test/unit/stellar_toml_resolver_test.js @@ -110,15 +110,13 @@ FEDERATION_SERVER="https://api.stellar.org/federation" it("rejects after given timeout when global Config.timeout flag is set", function (done) { StellarSdk.Config.setTimeout(100); + // Unable to create temp server in a browser if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.STELLAR_TOML_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - setTimeout(() => { - res.setHeader('Content-Type', 'text/x-toml; charset=UTF-8'); - res.end(response); - }, 10000); + setTimeout(() => {}, 10000); }).listen(4444, () => { StellarSdk.StellarTomlResolver.resolve("localhost:4444", {allowHttp: true}) .should.be.rejectedWith(/timeout of 100ms exceeded/) @@ -132,12 +130,9 @@ FEDERATION_SERVER="https://api.stellar.org/federation" if (typeof window != 'undefined') { return done(); } - var response = Array(StellarSdk.STELLAR_TOML_MAX_SIZE+10).join('a'); + let tempServer = http.createServer((req, res) => { - setTimeout(() => { - res.setHeader('Content-Type', 'text/x-toml; charset=UTF-8'); - res.end(response); - }, 10000); + setTimeout(() => {}, 10000); }).listen(4444, () => { StellarSdk.StellarTomlResolver.resolve("localhost:4444", {allowHttp: true, timeout: 100}) .should.be.rejectedWith(/timeout of 100ms exceeded/)