Emily Stark ccfee68145 Merge branch 'master' into devel ...

Conflicts:
	docs/client/api.html
	docs/client/data.js
	docs/client/names.json
	meteor
	packages/autoupdate/package.js
	packages/base64/.gitignore
	packages/constraint-solver/package.js
	packages/device-orientation/.gitignore
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/package-version-parser/package.js
	packages/webapp/webapp_server.js
	scripts/admin/meteor-release-experimental.json
	tools/commands.js
	tools/help.txt
	tools/package-version-parser.js
	tools/run-all.js
	tools/tests/apps/build-errors/packages/with-colon-plugin/.gitignore

2014-09-15 14:48:57 -07:00

..

apps

do not ship the versios.json in test data

2014-09-15 13:22:16 -07:00

fake-mongod

'update during run' passes.

2014-06-25 17:33:55 -07:00

old

Merge branch 'master' into devel

2014-09-15 14:48:57 -07:00

packages

prerelease versions shouldn't prompt you do update

2014-08-26 23:56:51 -07:00

authorized.js

Fix authorized test for DEPLOY_HOSTNAME

2014-08-27 15:56:08 -07:00

autoupdate.js

METEOR-CORE -> METEOR

2014-08-24 18:46:37 -07:00

build-errors.js

parse-stack: don't choke on files with colons

2014-09-12 12:31:36 -07:00

bundle.js

Add simple 'meteor bundle' selftest

2014-06-24 16:49:19 -07:00

claim.js

Call logout in selftests that log in.

2014-03-14 18:50:48 -07:00

command-line.js

Fix command line test

2014-08-20 21:19:50 -07:00

constraint-solver.js

don't run constraint-solver test from release

2014-07-28 16:07:41 -07:00

cordova-platforms.js

Fix remove-platforms error message

2014-08-20 11:34:37 -07:00

cordova-plugins.js

Fix "add cordova plugins" test.

2014-09-09 14:05:22 -07:00

create.js

don't print out version changes for a newly created app, with test

2014-07-08 22:41:21 -07:00

ddp-heartbeat.js

Move the ddp-heartbeat test into tools/tests.

2014-03-30 20:03:29 -07:00

deploy-auth.js

Progress towards self-test using DEPLOY_HOSTNAME.

2014-08-25 19:37:47 -07:00

deploy-settings.js

Change a thrown exception to 'selftest.fail'

2014-08-28 09:03:34 -07:00

help.js

fix help test

2014-08-21 19:37:23 -07:00

hot-code-push.js

Remove trailing commas

2014-09-09 16:41:06 -07:00

list-sites.js

Progress towards self-test using DEPLOY_HOSTNAME.

2014-08-25 19:37:47 -07:00

login.js

Remove 'expectEnd' from login test.

2014-08-27 19:36:57 -07:00

logs-mongo-auth.js

Progress towards self-test using DEPLOY_HOSTNAME.

2014-08-25 19:37:47 -07:00

mongo.js

Test that observeChanges works over a failover

2014-04-10 16:56:32 -07:00

npm.js

self-test now passes

2014-06-26 17:32:17 -07:00

old.js

Remove 'old cli tests (warehouse)'.

2014-09-11 15:31:02 -07:00

organizations.js

Add packages organizations selftest

2014-08-27 15:56:08 -07:00

package-tests.js

Merge branch 'master' into devel

2014-09-15 14:48:57 -07:00

publish.js

prerelease versions shouldn't prompt you do update

2014-08-26 23:56:51 -07:00

registration.js

Remove some more strict checks in auth tests.

2014-08-27 22:54:35 -07:00

releases.js

METEOR-CORE -> METEOR

2014-08-24 18:46:37 -07:00

report-stats.js

METEOR-CORE -> METEOR

2014-08-24 18:46:37 -07:00

run.js

Fix test (broken by bdcf0d188 at least on my mac)

2014-09-08 21:29:14 -07:00

selftest-test.js

Add a lot more buildmessage captures

2014-08-11 17:06:28 -04:00

utils-tests.js

Less greedy algorithm for choosing builds

2014-06-20 18:12:40 -07:00

version-parser.js

tests

2014-05-28 19:05:27 -07:00