Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move piwik whitelists to conf and add piwik config.json info to readme #5653

Merged
merged 2 commits into from
Jan 12, 2018
+17 −0
Merged

move piwik whitelists to conf and add piwik config.json info to readme #5653

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2626998
move piwik whitelists to conf and add piwik config.json info to readme
t3chguy Nov 19, 2017
f7a26dd
fix (race?) broken tests
t3chguy Nov 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix (race?) broken tests 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
t3chguy committed Nov 19, 2017
commit f7a26ddb915143918e93a0fea89a0b7d0394355d
5 changes: 5 additions & 0 deletions test/app-tests/joining.js
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@ limitations under the License.

/* joining.js: tests for the various paths when joining a room */

import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
import Platform from '../../src/vector/platform';

require('skin-sdk');

var jssdk = require('matrix-js-sdk');
@@ -85,6 +88,8 @@ describe('joining a room', function () {
localStorage.setItem("mx_access_token", ACCESS_TOKEN );
localStorage.setItem("mx_user_id", USER_ID);

PlatformPeg.set(new Platform());

var mc = (
<MatrixChat config={{}}
makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
5 changes: 5 additions & 0 deletions test/app-tests/loading.js
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@ limitations under the License.

/* loading.js: test the myriad paths we have for loading the application */

import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
import Platform from '../../src/vector/platform';

import 'skin-sdk';

import React from 'react';
@@ -137,6 +140,8 @@ describe('loading:', function () {
default_is_url: DEFAULT_IS_URL,
}, opts.config || {});

PlatformPeg.set(new Platform());

var params = parseQs(windowLocation);
matrixChat = ReactDOM.render(
<MatrixChat