Commit Graph

1143 Commits

Author SHA1 Message Date
Nick Martin
714e513b99 Upgrade Node.js from 0.10.25 to 0.10.26 2014-04-07 22:56:41 -07:00
David Glasser
498e572230 Make self-test less flaky with more waits. 2014-04-07 20:09:30 -07:00
David Glasser
3405644027 Fix runner.stop() while waiting for file change
Before this, if the runner decided to stop (eg, because mongod is
crashing too much) while waiting for file change, it would crash due to
an attempt to wait within a fiber.  Fixing that bug by adding an inFiber
would then lead to the process just not exiting, because nothing stops
the wait-specific future.
2014-04-02 21:16:59 -07:00
David Glasser
82aa3485ac Assign the Fiber to self.fiber.
Doing so reveals a deadlock in the stop code (which causes self-test to
fail, yay).  Fix it by trying harder to not stop the (all or app) runner
until after the app runner has processed the "hey you should stop"
return false from onRunEnd.
2014-04-02 20:27:54 -07:00
David Glasser
f36abc946e Generalize "load *.html files first" hack
Now any plugin can request that its files be treated as "templates" by
setting an isTemplate flag.

(This API is just as supported as you'd expect based on the fact that
you still can't access it without calling a function which starts with
"_transitional_".)

Tested by renaming leaderboard.js to a.js and confirming that it still
works (and that it *doesn't* if templating does not set isTemplate).
2014-04-01 17:21:24 -07:00
David Glasser
d287d36bac Make run tests less flaky 2014-03-31 20:03:01 -07:00
David Glasser
3e76ad7946 Don't use require('./run-log.js').runLog
If you happen to introduce a circular require into the stack, this
object will be undefined.

Instead, hang on to `require('./run-log.js')`, which is the exports
module which does get filled in later.
2014-03-31 19:52:02 -07:00
Andrew Wilcox
6f4f723c6a Allow user to set heartbeat interval to 0 to disable sending pings.
Add test flag `_respondToPings` which allows tests to disable
responding to pings.
2014-03-30 20:03:29 -07:00
Andrew Wilcox
8709365598 Stop heartbeats on client side disconnect.
Use heartbeatInterval: 0 to disable heartbeats for testing.

No need to add `_internal` to the public connection API because we
can get to the internal session through the server.
2014-03-30 20:03:29 -07:00
Andrew Wilcox
865eb30015 Move protocol out of heartbeat.js 2014-03-30 20:03:29 -07:00
Andrew Wilcox
0ac3bf9d4b Move the ddp-heartbeat test into tools/tests. 2014-03-30 20:03:29 -07:00
Avital Oliver
72c901553e Merge branch 'release-0.8.0' into devel
Conflicts:
	History.md
2014-03-26 20:55:34 -07:00
David Glasser
1d9c2443e8 Automatically remove deprecated preserve-inputs 2014-03-26 15:02:34 -07:00
David Glasser
b2632d45c5 Move boilerplate HTML from tools to webapp
This breaks a strong dependency between the webapp package and the
bundler.  Now we can change the standard page format, add more hooks,
etc without changing the tools (and hot code push works properly).

This is an incompatible change to the definition of the
browser-program-pre1 format: it no longer contains a "page" field
pointing to a boilerplate defined using ad hoc ##FOO##
substitution. Instead, the manifest can contain "head" and "body"
entries for data added with compileStep.appendDocument().  (Note that in
Blaze, <body> in a template file no longer calls appendDocument.)

WebApp.addHtmlAttributeHook callbacks now return attribute objects (like
those that Spacebars supports) rather than strings.
2014-03-24 20:10:39 -07:00
Avital Oliver
4d45f24260 Merge branch 'shark' into devel 2014-03-22 01:54:55 -07:00
Emily Stark
fc3cbd6689 Remove extra 'login' help text.
Looks like a mistake in a merge. Fixes #1934.
2014-03-20 07:21:11 -07:00
Nick Martin
d8575d0a24 Merge branch 'devel' into shark 2014-03-17 15:51:18 -07:00
Emily Stark
70689568f6 Make final logout unconditional for logs-mongo tests 2014-03-14 18:50:48 -07:00
Emily Stark
ff8abb4b04 Call logout in selftests that log in.
This avoids wracking up huge numbers of login tokens for the test
user. It would be nice to have these automatically cleaned up, but this
will do for now.
2014-03-14 18:50:48 -07:00
Emily Stark
85c7fa93e6 Add missing selftest 'var' 2014-03-14 18:50:48 -07:00
Emily Stark
4e19bf5e1d add semicolon 2014-03-14 18:50:48 -07:00
Avital Oliver
93c831b74e Merge branch 'devel' into shark 2014-03-10 15:55:57 -07:00
David Greenspan
084ee3bf4f Merge branch 'devel' into shark
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-03-06 16:21:33 -08:00
David Glasser
57104f6a8d Better error handling around a method call
- Make sure not to double-resolve a future (using two different
  techniques!)

- Try/finally cleanup some resources
2014-03-05 13:32:31 -08:00
David Glasser
3ebc9aba60 arguably support empty regexs in file watcher 2014-02-28 11:59:03 -08:00
Emily Stark
9c1dc8782c Clean up ServiceConnection timer when we receive a result.
Previously, we could make a connection, do some method calls, and then
10 seconds later the connection happens to be dropped and the connection
timer fires, which not only throws an unexpected error into the future,
but also resolves the future twice. I think ServiceConnection is just
supposed to time out if you don't hear anything from the server within
10 seconds, so it now no longer times out if you hear things from the
server but then happen to be not connected when 10 seconds has elapsed.
2014-02-27 08:09:31 -08:00
Emily Stark
bc4524b544 Set up onReconnect after initial sub on the connection to log-reader.
If we set it up before `subscribeAndWait` returns, then we'll end up
with two subscriptions; we don't have the log-reader sub yet, so we
can't stop it when `onReconnect` runs the first time, so we end up with
a redundant subscription. This means that if a real reconnect happens
later, we'll stop the sub that we set up inside `onReconnect`, but not
the initial sub, so we've leaked a sub and end up with duplicate
messages after reconnect.
2014-02-27 07:56:36 -08:00
Emily Stark
9d5782b9a0 Return the sub from ServiceConnection.subscribeAndWait 2014-02-27 07:56:19 -08:00
Emily Stark
35c1a5fc45 Replace subscribeAndWait with subscribe inside onReconnect 2014-02-26 23:57:18 -08:00
Emily Stark
825082b3a8 Add missing semicolon in deploy-galaxy 2014-02-26 23:49:18 -08:00
Emily Stark
e981b0c629 Bump run test timeouts 2014-02-26 14:26:13 -08:00
Avital Oliver
5671eaa2b7 Merge branch 'devel' into shark
Conflicts:
	packages/minifiers/package.js
	packages/preserve-inputs/package.js
	packages/test-in-browser/driver.css
	packages/test-in-browser/driver.js
2014-02-25 15:50:36 -08:00
David Glasser
0aa0bf0ade Make some tests more likely to pass on slow net
We really should download 0.7.0.1 just once for all tests as some
special-cased thing in selftest.js, I think.
2014-02-25 00:28:48 -08:00
Emily Stark
ce84c228e0 Avoid returning twice on error in files.run 2014-02-24 20:52:55 -08:00
Emily Stark
fabd6c6246 Don't print 'undefined' around banner text 2014-02-24 13:42:14 -08:00
Emily Stark
d6f04ba5dd Fix exceptions in galaxy deploy 2014-02-22 17:45:24 -08:00
David Glasser
3cd00c89af Avoid stack trace with empty '.meteor/release' file
This is not a regression against 0.7.0.1.

Fixes #1849.
2014-02-21 15:00:33 -08:00
David Glasser
203917df1e Don't print "overrides project version (null)"
Specifically, when using checkout meteor with a project with no
.meteor/release file (ie, a pre-0.6.0 app, not a "none"-pinned app), we
used to print

  => Running Meteor from a checkout -- overrides project version (null)

but now we won't.
2014-02-21 14:50:44 -08:00
Emily Stark
222ac4ca65 Bump more self-test timeouts 2014-02-21 10:22:03 -08:00
Emily Stark
8f2a0abe31 Remove unnecessary help text line break. 2014-02-21 10:09:11 -08:00
Emily Stark
0eaa021f4c Just drop sourcemaps that fail to be applied. 2014-02-21 09:05:51 -08:00
Slava Kim
58dc0ee3bb Print a warning if the generated source map failed to be applied 2014-02-20 19:32:16 -08:00
Emily Stark
9669bbe368 Bump some run test timeouts 2014-02-20 17:25:14 -08:00
David Glasser
54074fdac7 Fix crash if populating packages in two processes 2014-02-20 15:35:38 -08:00
Emily Stark
f19331fc44 Merge branch 'meteor-accounts-ux-pass' into release-0.7.1 2014-02-20 00:00:16 -08:00
Slava Kim
7b9ca3d0cc Allow stylesheets to register source maps 2014-02-19 23:56:10 -08:00
Emily Stark
ab3577d3d5 Update tests for changed accounts UX 2014-02-19 23:44:04 -08:00
Emily Stark
cebffa7848 Use stderr for login prompt on deploy with expired token 2014-02-19 23:43:35 -08:00
Emily Stark
89b1a73002 Make options optional on pollForRegistrationCompletion 2014-02-19 23:43:18 -08:00
Emily Stark
857b4e0a4c Merge branch 'meteor-accounts-ux-pass' of github.com:meteor/meteor into meteor-accounts-ux-pass 2014-02-19 19:37:12 -08:00