Skip to content

Commit

Permalink
Merge pull request #7496 from RocketChat/meteor-update
Browse files Browse the repository at this point in the history 
[NEW] Update meteor to 1.5.1
  • Loading branch information
@engelgabriel
engelgabriel committed Jul 18, 2017
2 parents 712dbc4 + f6598ca commit 3fb761a
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 65 deletions.
16 changes: 8 additions & 8 deletions .meteor/packages
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
# but you can also edit it by hand.

rocketchat:cors
accounts-facebook@1.2.0
accounts-facebook@1.2.1
accounts-github@1.3.0
accounts-google@1.2.0
accounts-meteor-developer@1.3.0
accounts-password@1.3.6
accounts-password@1.4.0
accounts-twitter@1.3.0
blaze-html-templates
check@1.2.5
ddp-rate-limiter@1.0.7
ecmascript@0.8.0
ecmascript@0.8.1
ejson@1.0.13
email@1.2.1
email@1.2.3
fastclick@1.0.13
http@1.2.12
jquery@1.11.10
less@2.7.9
logging@1.1.17
meteor-base@1.1.0
mobile-experience@1.0.4
mongo@1.1.18
mongo@1.1.19
random@1.0.10
rate-limit@1.0.8
reactive-dict@1.1.9
reactive-var@1.0.11
reload@1.1.11
service-configuration@1.0.11
session@1.1.7
shell-server@0.2.3
shell-server@0.2.4
spacebars
standard-minifier-js@2.1.0
standard-minifier-js@2.1.1
tracker@1.1.3

rocketchat:2fa
Expand Down Expand Up @@ -172,4 +172,4 @@ yasaricli:slugify
yasinuslu:blaze-meta
deepwell:bootstrap-datepicker2
rocketchat:postcss
dynamic-import
dynamic-import@0.1.1
2 changes: 1 addition & 1 deletion .meteor/release
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.5
METEOR@1.5.1
38 changes: 19 additions & 19 deletions .meteor/versions
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
accounts-base@1.3.0
accounts-base@1.3.1
accounts-facebook@1.2.1
accounts-github@1.3.0
accounts-google@1.2.0
accounts-meteor-developer@1.3.0
accounts-oauth@1.1.15
accounts-password@1.3.7
accounts-password@1.4.0
accounts-twitter@1.3.0
aldeed:simple-schema@1.5.3
allow-deny@1.0.5
allow-deny@1.0.6
autoupdate@1.3.12
babel-compiler@6.19.3
babel-compiler@6.19.4
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
Expand All @@ -24,19 +24,19 @@ cfs:http-methods@0.0.32
check@1.2.5
coffeescript@1.12.6_1
dandv:caret-position@2.1.1
ddp@1.2.5
ddp-client@1.3.4
ddp-common@1.2.8
ddp@1.3.0
ddp-client@2.0.0
ddp-common@1.2.9
ddp-rate-limiter@1.0.7
ddp-server@1.3.14
ddp-server@2.0.0
deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
diff-sequence@1.0.7
dispatch:run-as-user@1.1.1
dynamic-import@0.1.1
ecmascript@0.8.1
ecmascript@0.8.2
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.2
ecmascript-runtime-client@0.4.3
ecmascript-runtime-server@0.4.1
edgee:slingshot@0.7.1
ejson@1.0.13
Expand All @@ -62,7 +62,7 @@ jparker:gravatar@0.5.1
jquery@1.11.10
kadira:blaze-layout@2.3.0
kadira:flow-router@2.12.1
kenton:accounts-sandstorm@0.6.0
kenton:accounts-sandstorm@0.2.0
konecty:change-case@2.3.0
konecty:delayed-task@1.0.0
konecty:mongo-counter@0.0.5_3
Expand All @@ -72,26 +72,26 @@ konecty:user-presence@1.2.9
launch-screen@1.1.1
less@2.7.9
livedata@1.0.18
localstorage@1.1.0
localstorage@1.1.1
logging@1.1.17
matb33:collection-hooks@0.8.4
mdg:validation-error@0.5.1
meteor@1.6.1
meteor@1.7.0
meteor-base@1.1.0
meteor-developer-oauth@1.2.0
meteorhacks:inject-initial@1.0.4
meteorhacks:meteorx@1.4.1
meteorspark:util@0.2.0
minifier-css@1.2.16
minifier-js@2.1.0
minifier-js@2.1.1
minimongo@1.2.1
mizzao:autocomplete@0.5.1
mizzao:timesync@0.3.4
mobile-experience@1.0.4
mobile-status-bar@1.0.14
modules@0.9.2
modules-runtime@0.8.0
mongo@1.1.18
mongo@1.1.19
mongo-id@1.0.6
mongo-livedata@1.0.12
mrt:reactive-store@0.0.1
Expand All @@ -106,7 +106,7 @@ oauth2@1.1.11
observe-sequence@1.0.16
ordered-dict@1.0.9
ostrio:cookies@2.2.1
pauli:accounts-linkedin@2.1.2
pauli:accounts-linkedin@2.1.3
pauli:linkedin-oauth@1.1.0
percolate:synced-cron@1.3.2
promise@0.8.9
Expand Down Expand Up @@ -228,13 +228,13 @@ routepolicy@1.0.12
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.3
shell-server@0.2.4
simple:json-routes@2.1.0
smoral:sweetalert@1.1.1
spacebars@1.0.15
spacebars-compiler@1.1.2
srp@1.0.10
standard-minifier-js@2.1.0
standard-minifier-js@2.1.1
steffo:meteor-accounts-saml@0.0.1
tap:i18n@1.8.2
templating@1.3.2
Expand All @@ -250,7 +250,7 @@ ui@1.0.13
underscore@1.0.10
underscorestring:underscore.string@3.3.4
url@1.1.0
webapp@1.3.16
webapp@1.3.17
webapp-hashing@1.0.9
yasaricli:slugify@0.0.7
yasinuslu:blaze-meta@0.3.3
20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"start": "meteor npm i && meteor",
"lint": "eslint .",
"lint-fix": "eslint . --fix",
"stylelint": "stylelint packages/**/*.{less,css}",
"stylelint": "stylelint 'packages/**/*.{less,css}'",
"test": "node .scripts/start.js",
"deploy": "npm run build && pm2 startOrRestart pm2.json",
"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
Expand All @@ -79,30 +79,30 @@
"devDependencies": {
"babel-mocha-es6-compiler": "^0.1.0",
"babel-plugin-array-includes": "^2.0.3",
"chimp": "^0.49.0",
"conventional-changelog-cli": "^1.3.1",
"eslint": "^4.1.1",
"chimp": "^0.49.1",
"conventional-changelog-cli": "^1.3.2",
"eslint": "^4.2.0",
"postcss-cssnext": "^2.11.0",
"postcss-smart-import": "^0.7.4",
"postcss-smart-import": "^0.7.5",
"simple-git": "^1.73.0",
"stylelint": "^7.12.0",
"stylelint": "^7.13.0",
"supertest": "^3.0.0"
},
"dependencies": {
"@google-cloud/storage": "^1.1.1",
"aws-sdk": "^2.80.0",
"@google-cloud/storage": "^1.2.0",
"aws-sdk": "^2.86.0",
"babel-runtime": "^6.23.0",
"bcrypt": "^1.0.2",
"codemirror": "^5.27.4",
"file-type": "^5.2.0",
"highlight.js": "^9.12.0",
"jquery": "^3.2.1",
"mime-db": "^1.28.0",
"mime-db": "^1.29.0",
"mime-type": "^3.0.5",
"moment": "^2.18.1",
"moment-timezone": "^0.5.13",
"photoswipe": "^4.1.2",
"prom-client": "^9.1.1",
"prom-client": "^10.0.2",
"semver": "^5.3.0",
"toastr": "^2.1.2"
}
Expand Down
18 changes: 9 additions & 9 deletions packages/rocketchat-livechat/app/.meteor/packages
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

meteor@1.6.1
webapp@1.3.16
meteor@1.7.0
webapp@1.3.17
logging@1.1.17
tracker@1.1.3
deps@1.0.12
session@1.1.7
ddp@1.2.5
ddp@1.3.0
livedata@1.0.18
mongo@1.1.18
mongo@1.1.19
blaze
ui
spacebars
Expand All @@ -31,12 +31,12 @@ underscorestring:underscore.string
momentjs:moment
mizzao:timesync
reactive-var@1.0.11
accounts-password@1.3.6
accounts-password@1.4.0
tap:i18n
smoral:sweetalert
ecmascript@0.8.0
ecmascript@0.8.1
es5-shim@4.6.15
standard-minifier-css@1.3.4
standard-minifier-js@2.1.0
shell-server@0.2.3
dynamic-import
standard-minifier-js@2.1.1
shell-server@0.2.4
dynamic-import@0.1.1
2 changes: 1 addition & 1 deletion packages/rocketchat-livechat/app/.meteor/release
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.5
METEOR@1.5.1
34 changes: 17 additions & 17 deletions packages/rocketchat-livechat/app/.meteor/versions
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
accounts-base@1.3.0
accounts-password@1.3.7
accounts-base@1.3.1
accounts-password@1.4.0
aldeed:simple-schema@1.5.3
allow-deny@1.0.5
babel-compiler@6.19.3
allow-deny@1.0.6
babel-compiler@6.19.4
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
Expand All @@ -15,17 +15,17 @@ callback-hook@1.0.10
cfs:http-methods@0.0.32
check@1.2.5
coffeescript@1.12.6_1
ddp@1.2.5
ddp-client@1.3.4
ddp-common@1.2.8
ddp@1.3.0
ddp-client@2.0.0
ddp-common@1.2.9
ddp-rate-limiter@1.0.7
ddp-server@1.3.14
ddp-server@2.0.0
deps@1.0.12
diff-sequence@1.0.7
dynamic-import@0.1.1
ecmascript@0.8.1
ecmascript@0.8.2
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.2
ecmascript-runtime-client@0.4.3
ecmascript-runtime-server@0.4.1
ejson@1.0.13
email@1.2.3
Expand All @@ -41,19 +41,19 @@ kadira:flow-router@2.12.1
konecty:nrr@2.0.2
less@2.7.9
livedata@1.0.18
localstorage@1.1.0
localstorage@1.1.1
logging@1.1.17
mdg:validation-error@0.5.1
meteor@1.6.1
meteor@1.7.0
meteorspark:util@0.2.0
minifier-css@1.2.16
minifier-js@2.1.0
minifier-js@2.1.1
minimongo@1.2.1
mizzao:timesync@0.5.0
modules@0.9.2
modules-runtime@0.8.0
momentjs:moment@2.18.1
mongo@1.1.18
mongo@1.1.19
mongo-id@1.0.6
npm-bcrypt@0.9.3
npm-mongo@2.2.24
Expand All @@ -71,13 +71,13 @@ routepolicy@1.0.12
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.3
shell-server@0.2.4
smoral:sweetalert@1.1.1
spacebars@1.0.15
spacebars-compiler@1.1.2
srp@1.0.10
standard-minifier-css@1.3.4
standard-minifier-js@2.1.0
standard-minifier-js@2.1.1
tap:i18n@1.8.2
templating@1.3.2
templating-compiler@1.3.2
Expand All @@ -88,5 +88,5 @@ ui@1.0.13
underscore@1.0.10
underscorestring:underscore.string@3.3.4
url@1.1.0
webapp@1.3.16
webapp@1.3.17
webapp-hashing@1.0.9
2 changes: 2 additions & 0 deletions tests/end-to-end/ui/12-settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ describe('[Api Settings Change]', () => {
});

it('it should send a bad word', () => {
sideNav.general.waitForVisible(5000);
sideNav.general.click();
mainContent.setTextToInput('badword');
mainContent.sendBtn.click();
mainContent.waitForLastMessageEqualsText('*******');
Expand Down

0 comments on commit 3fb761a

Please sign in to comment.