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

Use Meteor.absoluteUrl() in tests instead of digging out DDP url

Browse Source
This commit is contained in:
Emily Stark
2014-03-18 09:47:25 -07:00
parent 67d42747ed
commit 7ea715173c
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/accounts-password/password_tests.js
View File

@@ -205,16 +205,7 @@ if (Meteor.isClient) (function () {
function (test, expect) {
var self = this;
// copied from livedata/client_convenience.js
var ddpUrl = '/';
if (typeof __meteor_runtime_config__ !== "undefined") {
if (__meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL)
ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
}
// XXX can we get the url from the existing connection somehow
// instead?
self.secondConn = DDP.connect(ddpUrl);
self.secondConn = DDP.connect(Meteor.absoluteUrl());
self.secondConn.call('login',
{ user: { username: self.username }, password: self.password },
expect(function (err, result) {
@@ -480,20 +471,11 @@ if (Meteor.isClient) (function () {
function (test, expect) {
var self = this;
// copied from livedata/client_convenience.js
self.ddpUrl = '/';
if (typeof __meteor_runtime_config__ !== "undefined") {
if (__meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL)
self.ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
}
// XXX can we get the url from the existing connection somehow
// instead?
// Test that Meteor.logoutOtherClients logs out a second authenticated
// connection while leaving Accounts.connection logged in.
var token;
var userId;
self.secondConn = DDP.connect(self.ddpUrl);
self.secondConn = DDP.connect(Meteor.absoluteUrl());
var expectLoginError = expect(function (err) {
test.isTrue(err);