Make pub publish more user friendly:

utils/tests/pub/pub_lish_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 pub_lish_test;
 
 import 'dart:io';
 import 'dart:json';
 
 import 'test_pub.dart';
@@ skipping 35 matching lines @@
   });
 }
 
 main() {
   setUp(() => normalPackage.scheduleCreate());
 
   test('archives and uploads a package', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString(JSON.stringify({
         'success': {'message': 'Package test_pkg 1.0.0 uploaded!'}
       }));
       response.outputStream.close();
     });
 
-    expectLater(pub.nextLine(), equals('Package test_pkg 1.0.0 uploaded!'));
+    // 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)?'
+        ' Package test_pkg 1.0.0 uploaded!'));
     pub.shouldExit(0);
 
     run();
   });
 
   // TODO(nweiz): Once a multipart/form-data parser in Dart exists, we should
   // test that "pub lish" chooses the correct files to publish.
 
   test('credentials are invalid', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       response.statusCode = 401;
       response.headers.set('www-authenticate', 'Bearer error="invalid_token",'
           ' error_description="your token sucks"');
       response.outputStream.writeString(JSON.stringify({
         'error': {'message': 'your token sucks'}
       }));
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('OAuth2 authorization failed (your '
         'token sucks).'));
-    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.'));
     pub.kill();
-
     run();
   });
 
   test('package validation has an error', () {
     var package = package("test_pkg", "1.0.0");
     package.remove("homepage");
     dir(appPath, [pubspec(package)]).scheduleCreate();
 
     var server = new ScheduledServer();
-    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
-    server.ignore('GET', '/packages/versions/new.json');
 
     pub.shouldExit(1);
-    expectLater(pub.remainingStderr(), contains("Package validation failed."));
+    expectLater(pub.remainingStderr(),
+        contains("Sorry, your package is missing a requirement and can't be "
+            "published yet."));
 
     run();
   });
 
   test('package validation has a warning and is canceled', () {
     var package = package("test_pkg", "1.0.0");
     package["author"] = "Nathan Weizenbaum";
     dir(appPath, [pubspec(package)]).scheduleCreate();
 
     var server = new ScheduledServer();
-    credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
-    server.ignore('GET', '/packages/versions/new.json');
 
     pub.writeLine("n");
     pub.shouldExit(1);
     expectLater(pub.remainingStderr(), contains("Package upload canceled."));
 
     run();
   });
 
   test('package validation has a warning and continues', () {
     var package = package("test_pkg", "1.0.0");
@@ skipping 19 matching lines @@
         contains('Package test_pkg 1.0.0 uploaded!'));
 
     run();
   });
 
   test('upload form provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       response.statusCode = 400;
       response.outputStream.writeString(JSON.stringify({
         'error': {'message': 'your request sucked'}
       }));
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('your request sucked'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form provides invalid JSON', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     server.handle('GET', '/packages/versions/new.json', (request, response) {
       response.outputStream.writeString('{not json');
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals('{not json'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form is missing url', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     var body = {
       'fields': {
         'field1': 'value1',
         'field2': 'value2'
       }
     };
 
     handleUploadForm(server, body);
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form url is not a string', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     var body = {
       'url': 12,
       'fields': {
         'field1': 'value1',
         'field2': 'value2'
       }
     };
 
     handleUploadForm(server, body);
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form is missing fields', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     var body = {'url': 'http://example.com/upload'};
     handleUploadForm(server, body);
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form fields is not a map', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     var body = {'url': 'http://example.com/upload', 'fields': 12};
     handleUploadForm(server, body);
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('upload form fields has a non-string value', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
 
+    confirmPublish(pub);
+
     var body = {
       'url': 'http://example.com/upload',
       'fields': {'field': 12}
     };
     handleUploadForm(server, body);
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('cloud storage upload provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
 
     server.handle('POST', '/upload', (request, response) {
       response.statusCode = 400;
       response.headers.contentType = new ContentType('application', 'xml');
       response.outputStream.writeString('<Error><Message>Your request sucked.'
           '</Message></Error>');
       response.outputStream.close();
     });
 
     // TODO(nweiz): This should use the server's error message once the client
     // can parse the XML.
     expectLater(pub.nextErrLine(), equals('Failed to upload the package.'));
     pub.shouldExit(1);
 
     run();
   });
 
   test("cloud storage upload doesn't redirect", () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
 
     server.handle('POST', '/upload', (request, response) {
       // don't set the location header
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Failed to upload the package.'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides an error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.statusCode = 400;
       response.outputStream.writeString(JSON.stringify({
         'error': {'message': 'Your package was too boring.'}
       }));
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Your package was too boring.'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides invalid JSON', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
     handleUpload(server);
 
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString('{not json');
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals('{not json'));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides a malformed error', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
     handleUpload(server);
 
     var body = {'error': 'Your package was too boring.'};
     server.handle('GET', '/create', (request, response) {
       response.statusCode = 400;
       response.outputStream.writeString(JSON.stringify(body));
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 
   test('package creation provides a malformed success', () {
     var server = new ScheduledServer();
     credentialsFile(server, 'access token').scheduleCreate();
     var pub = startPubLish(server);
+
+    confirmPublish(pub);
     handleUploadForm(server);
     handleUpload(server);
 
     var body = {'success': 'Your package was awesome.'};
     server.handle('GET', '/create', (request, response) {
       response.outputStream.writeString(JSON.stringify(body));
       response.outputStream.close();
     });
 
     expectLater(pub.nextErrLine(), equals('Invalid server response:'));
     expectLater(pub.nextErrLine(), equals(JSON.stringify(body)));
     pub.shouldExit(1);
 
     run();
   });
 }