q(...) -> Promise.resolve
``` find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/' ```
This commit is contained in:
@@ -58,7 +58,7 @@ var Tester = React.createClass({
|
||||
if (handler) {
|
||||
res = handler();
|
||||
} else {
|
||||
res = q(false);
|
||||
res = Promise.resolve(false);
|
||||
}
|
||||
|
||||
if (defer) {
|
||||
@@ -168,7 +168,7 @@ describe('ScrollPanel', function() {
|
||||
const sp = tester.scrollPanel();
|
||||
let retriesRemaining = 1;
|
||||
const awaitReady = function() {
|
||||
return q().then(() => {
|
||||
return Promise.resolve().then(() => {
|
||||
if (sp._pendingFillRequests.b === false &&
|
||||
sp._pendingFillRequests.f === false
|
||||
) {
|
||||
@@ -195,7 +195,7 @@ describe('ScrollPanel', function() {
|
||||
it('should handle scrollEvent strangeness', function() {
|
||||
const events = [];
|
||||
|
||||
return q().then(() => {
|
||||
return Promise.resolve().then(() => {
|
||||
// initialise with a load of events
|
||||
for (let i = 0; i < 20; i++) {
|
||||
events.push(i+80);
|
||||
@@ -227,7 +227,7 @@ describe('ScrollPanel', function() {
|
||||
|
||||
it('should not get stuck in #528 workaround', function(done) {
|
||||
var events = [];
|
||||
q().then(() => {
|
||||
Promise.resolve().then(() => {
|
||||
// initialise with a bunch of events
|
||||
for (var i = 0; i < 40; i++) {
|
||||
events.push(i);
|
||||
|
||||
@@ -145,7 +145,7 @@ describe('TimelinePanel', function() {
|
||||
// panel isn't paginating
|
||||
var awaitPaginationCompletion = function() {
|
||||
if(!panel.state.forwardPaginating)
|
||||
return q();
|
||||
return Promise.resolve();
|
||||
else
|
||||
return q.delay(0).then(awaitPaginationCompletion);
|
||||
};
|
||||
@@ -214,7 +214,7 @@ describe('TimelinePanel', function() {
|
||||
client.paginateEventTimeline = sinon.spy((tl, opts) => {
|
||||
console.log("paginate:", opts);
|
||||
expect(opts.backwards).toBe(true);
|
||||
return q(true);
|
||||
return Promise.resolve(true);
|
||||
});
|
||||
|
||||
var rendered = ReactDOM.render(
|
||||
|
||||
@@ -50,7 +50,7 @@ describe('InteractiveAuthDialog', function () {
|
||||
|
||||
it('Should successfully complete a password flow', function() {
|
||||
const onFinished = sinon.spy();
|
||||
const doRequest = sinon.stub().returns(q({a:1}));
|
||||
const doRequest = sinon.stub().returns(Promise.resolve({a:1}));
|
||||
|
||||
// tell the stub matrixclient to return a real userid
|
||||
var client = MatrixClientPeg.get();
|
||||
|
||||
@@ -39,7 +39,7 @@ describe('RoomViewStore', function() {
|
||||
});
|
||||
|
||||
it('can be used to view a room by alias and join', function(done) {
|
||||
peg.get().getRoomIdForAlias.returns(q({room_id: "!randomcharacters:aser.ver"}));
|
||||
peg.get().getRoomIdForAlias.returns(Promise.resolve({room_id: "!randomcharacters:aser.ver"}));
|
||||
peg.get().joinRoom = (roomAddress) => {
|
||||
expect(roomAddress).toBe("#somealias2:aser.ver");
|
||||
done();
|
||||
|
||||
@@ -75,12 +75,12 @@ export function createTestClient() {
|
||||
on: sinon.stub(),
|
||||
removeListener: sinon.stub(),
|
||||
isRoomEncrypted: sinon.stub().returns(false),
|
||||
peekInRoom: sinon.stub().returns(q(mkStubRoom())),
|
||||
peekInRoom: sinon.stub().returns(Promise.resolve(mkStubRoom())),
|
||||
|
||||
paginateEventTimeline: sinon.stub().returns(q()),
|
||||
sendReadReceipt: sinon.stub().returns(q()),
|
||||
getRoomIdForAlias: sinon.stub().returns(q()),
|
||||
getProfileInfo: sinon.stub().returns(q({})),
|
||||
paginateEventTimeline: sinon.stub().returns(Promise.resolve()),
|
||||
sendReadReceipt: sinon.stub().returns(Promise.resolve()),
|
||||
getRoomIdForAlias: sinon.stub().returns(Promise.resolve()),
|
||||
getProfileInfo: sinon.stub().returns(Promise.resolve({})),
|
||||
getAccountData: (type) => {
|
||||
return mkEvent({
|
||||
type,
|
||||
@@ -89,9 +89,9 @@ export function createTestClient() {
|
||||
});
|
||||
},
|
||||
setAccountData: sinon.stub(),
|
||||
sendTyping: sinon.stub().returns(q({})),
|
||||
sendTextMessage: () => q({}),
|
||||
sendHtmlMessage: () => q({}),
|
||||
sendTyping: sinon.stub().returns(Promise.resolve({})),
|
||||
sendTextMessage: () => Promise.resolve({}),
|
||||
sendHtmlMessage: () => Promise.resolve({}),
|
||||
getSyncState: () => "SYNCING",
|
||||
generateClientSecret: () => "t35tcl1Ent5ECr3T",
|
||||
isGuest: () => false,
|
||||
@@ -101,13 +101,13 @@ export function createTestClient() {
|
||||
export function createTestRtsClient(teamMap, sidMap) {
|
||||
return {
|
||||
getTeamsConfig() {
|
||||
return q(Object.keys(teamMap).map((token) => teamMap[token]));
|
||||
return Promise.resolve(Object.keys(teamMap).map((token) => teamMap[token]));
|
||||
},
|
||||
trackReferral(referrer, emailSid, clientSecret) {
|
||||
return q({team_token: sidMap[emailSid]});
|
||||
return Promise.resolve({team_token: sidMap[emailSid]});
|
||||
},
|
||||
getTeam(teamToken) {
|
||||
return q(teamMap[teamToken]);
|
||||
return Promise.resolve(teamMap[teamToken]);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user