diff --git a/Gulpfile.js b/Gulpfile.js index 6269e499..09d21514 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -16,6 +16,9 @@ function webpackConfig(extension, overrides) { overrides = overrides || {}; var defaults = { cache: true, + externals: [{ + 'lodash': '_' + }], entry: './src/index.js', output: { library: 'ripple', @@ -52,6 +55,7 @@ function webpackConfigForWebTest(testFileName, path) { } var configOverrides = { externals: [{ + 'lodash': '_', 'ripple-api': 'ripple', 'net': 'null' }], diff --git a/test/integration/integration-test.js b/test/integration/integration-test.js index 848c87b7..e1240595 100644 --- a/test/integration/integration-test.js +++ b/test/integration/integration-test.js @@ -6,14 +6,14 @@ const assert = require('assert'); const errors = require('../../src/common/errors'); const wallet = require('./wallet'); const requests = require('../fixtures/requests'); -const RippleAPI = require('../../src').RippleAPI; +const RippleAPI = require('ripple-api').RippleAPI; const {isValidAddress} = require('ripple-address-codec'); const {isValidSecret} = require('../../src/common'); const {payTo, ledgerAccept} = require('./utils'); // how long before each test case times out -const TIMEOUT = process.browser ? 85000 : 10000; +const TIMEOUT = process.browser ? 25000 : 10000; const INTERVAL = 1000; // how long to wait between checks for validated ledger const serverUrl = 'ws://127.0.0.1:6006'; diff --git a/test/localintegrationrunner.html b/test/localintegrationrunner.html index e0df9362..b544c226 100644 --- a/test/localintegrationrunner.html +++ b/test/localintegrationrunner.html @@ -3,6 +3,7 @@ +
@@ -45,6 +46,9 @@ diff --git a/test/localrunner.html b/test/localrunner.html index 3b3d7e31..5506df9a 100644 --- a/test/localrunner.html +++ b/test/localrunner.html @@ -3,6 +3,7 @@ + @@ -45,6 +46,9 @@