Commit Graph

1128 Commits

Author SHA1 Message Date
David Glasser
1d9c2443e8 Automatically remove deprecated preserve-inputs 2014-03-26 15:02:34 -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
Emily Stark
eee4c0c9e7 Add test for deploying with expired credentials 2014-02-19 19:36:54 -08:00
Emily Stark
829dfdac68 Don't log out an invalid session immediately before deploy.
When we deploy:
* If we are logged in with a username, then we go straight to doing the
  actual deploy.
* If we are logged in without a username, we check if we have a username
  yet. If we have an invalid credential at this point, we do NOT want
  `pollForRegistrationComplete` to wipe our session file, because we
  already passed the point at which we handle the case of the user being
  logged out. Instead, we just want to continue with the deploy and let
  the deploy server handle the expired credential. (This case, where a
  user's credential has been expired before they set a username,
  shouldn't happen too often in real life.)
* If we deploy with an invalid credential, we get an "Expired
  credential" message.
2014-02-19 19:35:19 -08:00
Emily Stark
0663aaa435 Make Sandbox.writeSessionFile actually write the file 2014-02-19 17:04:22 -08:00
Geoff Schmidt
32ad71e50e Improve email-in-use flow 2014-02-19 16:24:16 -08:00
Emily Stark
023276cd50 Only show username prompt on deploy if we know the user has a username.
We don't want a user to see a username/password prompt if they haven't
set a username yet.
2014-02-19 15:52:57 -08:00
Emily Stark
1f8760acfc Update 'meteor claim' test for new prose 2014-02-19 15:52:31 -08:00
Emily Stark
2ff0fa38ed Correctly check for current username when deploying 2014-02-19 15:49:46 -08:00
Emily Stark
2f6bb62170 Use the same timeouts in login tests as everywhere else 2014-02-19 15:49:06 -08:00
Emily Stark
2ef965f34e Merge remote-tracking branch 'origin/release-0.7.1' into meteor-accounts-ux-pass
Conflicts:
	History.md
	tools/help.txt
	tools/tests/login.js
	tools/tests/registration.js
2014-02-19 15:28:48 -08:00
Emily Stark
423ae65d93 This time, actually add the test for 'meteor whoami'. 2014-02-19 14:47:54 -08:00
Emily Stark
c8e75d9afc Use fut.isResolved() instead of a separate 'resolved' variable.
Add test for 'meteor whoami' after setting username but before logging
in again.
2014-02-19 14:46:28 -08:00
Geoff Schmidt
92abbf2f5c deploy server now returns 401 for invalid credentials 2014-02-19 12:34:33 -08:00
Geoff Schmidt
31b387b775 fixed for 'meteor logs' on a galaxy 2014-02-19 12:34:08 -08:00
Emily Stark
8f9f793c32 Add test for 'meteor deploy --settings' 2014-02-19 11:33:13 -08:00
Emily Stark
77b3d03b8f Add missing var in deploy test 2014-02-19 10:20:02 -08:00