From f6bbe753a307a4a6d310e6051239acf1e02cfedd Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Fri, 10 Nov 2017 09:39:26 -0800 Subject: [PATCH] Remove LivedataTest! :tada: --- packages/ddp-client/client/client.js | 2 +- packages/ddp-client/client/stream_client_sockjs.js | 2 +- packages/ddp-client/common/namespace.js | 3 --- packages/ddp-client/common/stream_client_common.js | 2 +- packages/ddp-client/common/urlHelpers.js | 1 - packages/ddp-client/server/server.js | 2 +- packages/ddp-client/server/stream_client_nodejs.js | 4 +--- packages/ddp-client/test/livedata_connection_tests.js | 11 ++++++----- packages/ddp-client/test/livedata_tests.js | 7 ++++--- packages/ddp-client/test/stream_client_tests.js | 4 ++-- packages/ddp-client/test/stream_tests.js | 1 - 11 files changed, 17 insertions(+), 22 deletions(-) diff --git a/packages/ddp-client/client/client.js b/packages/ddp-client/client/client.js index 5ae5b5cc72..f2cbc06654 100644 --- a/packages/ddp-client/client/client.js +++ b/packages/ddp-client/client/client.js @@ -1,4 +1,4 @@ -export { DDP, LivedataTest } from '../common/namespace.js'; +export { DDP } from '../common/namespace.js'; if (false) { // This is used inside livedata_connection, but this is what gets diff --git a/packages/ddp-client/client/stream_client_sockjs.js b/packages/ddp-client/client/stream_client_sockjs.js index e34c3c22da..84768802e7 100644 --- a/packages/ddp-client/client/stream_client_sockjs.js +++ b/packages/ddp-client/client/stream_client_sockjs.js @@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor'; // This populates a global variable import './sockjs-0.3.4'; -import { DDP, LivedataTest } from '../common/namespace.js'; +import { DDP } from '../common/namespace.js'; import { toSockjsUrl } from '../common/urlHelpers.js'; import StreamClientCommon from '../common/stream_client_common.js'; diff --git a/packages/ddp-client/common/namespace.js b/packages/ddp-client/common/namespace.js index 33bfe918c7..5220fccf85 100644 --- a/packages/ddp-client/common/namespace.js +++ b/packages/ddp-client/common/namespace.js @@ -8,9 +8,6 @@ import { Connection } from './livedata_connection.js'; * @summary Namespace for DDP-related methods/classes. */ export const DDP = {}; -export const LivedataTest = { - Connection -}; // This is private but it's used in a few places. accounts-base uses // it to get the current user. Meteor.setTimeout and friends clear diff --git a/packages/ddp-client/common/stream_client_common.js b/packages/ddp-client/common/stream_client_common.js index c8b3fb8121..02badeb538 100644 --- a/packages/ddp-client/common/stream_client_common.js +++ b/packages/ddp-client/common/stream_client_common.js @@ -3,7 +3,7 @@ import { Meteor } from 'meteor/meteor'; import { Tracker } from 'meteor/tracker'; import { Retry } from 'meteor/retry'; -import { DDP, LivedataTest } from './namespace.js'; +import { DDP } from './namespace.js'; export default class StreamClientCommon { // Register for callbacks. diff --git a/packages/ddp-client/common/urlHelpers.js b/packages/ddp-client/common/urlHelpers.js index b1dd3f7667..1974aadbf3 100644 --- a/packages/ddp-client/common/urlHelpers.js +++ b/packages/ddp-client/common/urlHelpers.js @@ -1,4 +1,3 @@ -import { LivedataTest } from './namespace.js'; import { Random } from 'meteor/random'; // XXX from Underscore.String (http://epeli.github.com/underscore.string/) diff --git a/packages/ddp-client/server/server.js b/packages/ddp-client/server/server.js index 76c7cbf77e..6ca9ff0513 100644 --- a/packages/ddp-client/server/server.js +++ b/packages/ddp-client/server/server.js @@ -1,4 +1,4 @@ -export { DDP, LivedataTest } from '../common/namespace.js'; +export { DDP } from '../common/namespace.js'; if (false) { // This is used inside livedata_connection, but this is what gets diff --git a/packages/ddp-client/server/stream_client_nodejs.js b/packages/ddp-client/server/stream_client_nodejs.js index 74f6e33d7e..573fa77b27 100644 --- a/packages/ddp-client/server/stream_client_nodejs.js +++ b/packages/ddp-client/server/stream_client_nodejs.js @@ -1,7 +1,7 @@ import { _ } from 'meteor/underscore'; import { Meteor } from 'meteor/meteor'; -import { DDP, LivedataTest } from '../common/namespace.js'; +import { DDP } from '../common/namespace.js'; import { toWebsocketUrl } from '../common/urlHelpers.js'; import StreamClientCommon from '../common/stream_client_common.js'; @@ -205,5 +205,3 @@ export default class ClientStream extends StreamClientCommon { }); } } - -LivedataTest.ClientStream = ClientStream; diff --git a/packages/ddp-client/test/livedata_connection_tests.js b/packages/ddp-client/test/livedata_connection_tests.js index 168ccf0828..77133d368c 100644 --- a/packages/ddp-client/test/livedata_connection_tests.js +++ b/packages/ddp-client/test/livedata_connection_tests.js @@ -1,11 +1,12 @@ import lolex from 'lolex'; -import { DDP, LivedataTest } from '../common/namespace.js'; +import { DDP } from '../common/namespace.js'; +import { Connection } from '../common/livedata_connection.js'; var newConnection = function(stream, options) { // Some of these tests leave outstanding methods with no result yet // returned. This should not block us from re-running tests when sources // change. - return new LivedataTest.Connection( + return new Connection( stream, _.extend( { @@ -1830,7 +1831,7 @@ _.each(DDPCommon.SUPPORTED_DDP_VERSIONS, function(version) { test, onComplete ) { - var connection = new LivedataTest.Connection(getSelfConnectionUrl(), { + var connection = new Connection(getSelfConnectionUrl(), { reloadWithOutstanding: true, supportedDDPVersions: [version], onDDPVersionNegotiationFailure: function() { @@ -1936,7 +1937,7 @@ testAsyncMulti('livedata connection - reconnect to a different server', [ Tinytest.addAsync( 'livedata connection - version negotiation requires renegotiating', function(test, onComplete) { - var connection = new LivedataTest.Connection(getSelfConnectionUrl(), { + var connection = new Connection(getSelfConnectionUrl(), { reloadWithOutstanding: true, supportedDDPVersions: ['garbled', DDPCommon.SUPPORTED_DDP_VERSIONS[0]], onDDPVersionNegotiationFailure: function() { @@ -1956,7 +1957,7 @@ Tinytest.addAsync('livedata connection - version negotiation error', function( test, onComplete ) { - var connection = new LivedataTest.Connection(getSelfConnectionUrl(), { + var connection = new Connection(getSelfConnectionUrl(), { reloadWithOutstanding: true, supportedDDPVersions: ['garbled', 'more garbled'], onDDPVersionNegotiationFailure: function() { diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js index 9a649a4d4f..34d95449ee 100644 --- a/packages/ddp-client/test/livedata_tests.js +++ b/packages/ddp-client/test/livedata_tests.js @@ -1,4 +1,5 @@ -import { DDP, LivedataTest } from '../common/namespace.js'; +import { DDP } from '../common/namespace.js'; +import { Connection } from '../common/livedata_connection.js'; // XXX should check error codes var failure = function(test, code, reason) { @@ -704,7 +705,7 @@ if (Meteor.isClient) { function(test, expect) { // Use a separate connection so that we can safely check to see if // conn._subscriptions is empty. - conn = new LivedataTest.Connection('/', { + conn = new Connection('/', { reloadWithOutstanding: true }); collName = Random.id(); @@ -800,7 +801,7 @@ if (Meteor.isClient) { function(test, expect) { // Use a separate connection so that we can safely check to see if // conn._subscriptions is empty. - conn = new LivedataTest.Connection('/', { + conn = new Connection('/', { reloadWithOutstanding: true }); collName = Random.id(); diff --git a/packages/ddp-client/test/stream_client_tests.js b/packages/ddp-client/test/stream_client_tests.js index cf2e1e3700..23a8fd1ef8 100644 --- a/packages/ddp-client/test/stream_client_tests.js +++ b/packages/ddp-client/test/stream_client_tests.js @@ -1,10 +1,10 @@ -import { LivedataTest } from '../common/namespace.js'; +import ClientStream from '../server/stream_client_nodejs.js'; var Fiber = Npm.require('fibers'); testAsyncMulti('stream client - callbacks run in a fiber', [ function(test, expect) { - var stream = new LivedataTest.ClientStream(Meteor.absoluteUrl()); + var stream = new ClientStream(Meteor.absoluteUrl()); var messageFired = false; var resetFired = false; diff --git a/packages/ddp-client/test/stream_tests.js b/packages/ddp-client/test/stream_tests.js index 0704db6c5e..20e67bb6d5 100644 --- a/packages/ddp-client/test/stream_tests.js +++ b/packages/ddp-client/test/stream_tests.js @@ -1,4 +1,3 @@ -import { LivedataTest } from '../common/namespace.js'; import { toSockjsUrl } from '../common/urlHelpers.js'; import getClientStreamClass from '../common/getClientStreamClass.js';