Make pub publish more user friendly:

utils/tests/pub/oauth2_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library oauth2_test;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
 import 'test_pub.dart';
 import '../../../pkg/http/lib/http.dart' as http;
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/io.dart';
 import '../../pub/utils.dart';
 
 main() {
   setUp(() => normalPackage.scheduleCreate());
 
   test('with no credentials.json, authenticates and saves credentials.json',
       () {
     var server = new ScheduledServer();
     var pub = startPubLish(server);
+    confirmPublish(pub);
     authorizePub(pub, server);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
     credentialsFile(server, 'access token').scheduleValidate();
 
     run();
   });
 
   test('with a pre-existing credentials.json does not authenticate', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+    confirmPublish(pub);
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
     run();
   });
 
   test('with an expired credentials.json, refreshes and saves the refreshed '
       'access token to credentials.json', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token',
         refreshToken: 'refresh token',
         expiration: new Date.now().subtract(new Duration(hours: 1)))
         .scheduleCreate();
 
     var pub = startPubLish(server);
+    confirmPublish(pub);
 
     server.handle('POST', '/token', (request, response) {
       return consumeInputStream(request.inputStream).transform((bytes) {
         var body = new String.fromCharCodes(bytes);
         expect(body, matches(
             new RegExp(r'(^|&)refresh_token=refresh%20token(&|$)')));
 
         response.headers.contentType = new ContentType("application", "json");
         response.outputStream.writeString(JSON.stringify({
           "access_token": "new access token",
@@ skipping 19 matching lines @@
   });
 
   test('with an expired credentials.json without a refresh token, '
        'authenticates again and saves credentials.json', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token',
         expiration: new Date.now().subtract(new Duration(hours: 1)))
         .scheduleCreate();
 
     var pub = startPubLish(server);
+    confirmPublish(pub);
 
     expectLater(pub.nextErrLine(), equals("Pub's authorization to upload "
           "packages has expired and can't be automatically refreshed."));
     authorizePub(pub, server, "new access token");
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
     credentialsFile(server, 'new access token').scheduleValidate();
 
     run();
   });
 
   test('with a malformed credentials.json, authenticates again and saves '
       'credentials.json', () {
     var server = new ScheduledServer();
     dir(cachePath, [
       file('credentials.json', '{bad json')
     ]).scheduleCreate();
 
     var pub = startPubLish(server);
+    confirmPublish(pub);
     authorizePub(pub, server, "new access token");
 
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       expect(request.headers.value('authorization'),
           equals('Bearer new access token'));
 
       response.outputStream.close();
     });
 
     pub.kill();
 
     credentialsFile(server, 'new access token').scheduleValidate();
 
     run();
   });
 }
 
 void authorizePub(ScheduledProcess pub, ScheduledServer server,
     [String accessToken="access token"]) {
-  expectLater(pub.nextLine(), equals('Pub needs your '
-     'authorization to upload packages on your behalf.'));
+  // TODO(rnystrom): The confirm line is run together with this one because
+  // in normal usage, the user will have entered a newline on stdin which
+  // gets echoed to the terminal. Do something better here?
+  expectLater(pub.nextLine(), equals(
+      'Looks great! Are you ready to upload your package (y/n)? '
+      'Pub needs your authorization to upload packages on your behalf.'));
 
   expectLater(pub.nextLine().chain((line) {
     var match = new RegExp(r'[?&]redirect_uri=([0-9a-zA-Z%+-]+)[$&]')
         .firstMatch(line);
     expect(match, isNotNull);
 
     var redirectUrl = new Uri.fromString(decodeUriComponent(match.group(1)));
     redirectUrl = addQueryParameters(redirectUrl, {'code': 'access code'});
     return (new http.Request('GET', redirectUrl)..followRedirects = false)
       .send();
@@ skipping 13 matching lines @@
 
       response.headers.contentType = new ContentType("application", "json");
       response.outputStream.writeString(JSON.stringify({
         "access_token": accessToken,
         "token_type": "bearer"
       }));
       response.outputStream.close();
     });
   });
 }