github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove LivedataTest! 🎉

Browse Source
This commit is contained in:
Sashko Stubailo
2017-11-10 09:39:26 -08:00
parent 46ddbe62d1
commit f6bbe753a3
11 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ddp-client/client/client.js
View File

@@ -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

2
packages/ddp-client/client/stream_client_sockjs.js
View File

@@ -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';

3
packages/ddp-client/common/namespace.js
View File

@@ -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

2
packages/ddp-client/common/stream_client_common.js
View File

@@ -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.

1
packages/ddp-client/common/urlHelpers.js
View File

@@ -1,4 +1,3 @@
import { LivedataTest } from './namespace.js';
import { Random } from 'meteor/random';
// XXX from Underscore.String (http://epeli.github.com/underscore.string/)

2
packages/ddp-client/server/server.js
View File

@@ -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

4
packages/ddp-client/server/stream_client_nodejs.js
View File

@@ -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;

11
packages/ddp-client/test/livedata_connection_tests.js
View File

@@ -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() {

7
packages/ddp-client/test/livedata_tests.js
View File

@@ -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();

4
packages/ddp-client/test/stream_client_tests.js
View File

@@ -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;

1
packages/ddp-client/test/stream_tests.js
View File

@@ -1,4 +1,3 @@
import { LivedataTest } from '../common/namespace.js';
import { toSockjsUrl } from '../common/urlHelpers.js';
import getClientStreamClass from '../common/getClientStreamClass.js';