Reapply "Fix URI encoding/decoding of + and space""

utils/tests/pub/curl_client_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 curl_client_test;
 
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:uri';
 
@@ skipping 40 matching lines @@
       'other-field': 'other value'
     }).transform((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'POST',
         'path': '/',
         'headers': {
           'content-type': [
             'application/x-www-form-urlencoded; charset=UTF-8'
           ],
-          'content-length': ['42'],
+          'content-length': ['40'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
-        'body': 'some-field=value&other-field=other%20value'
+        'body': 'some-field=value&other-field=other+value'
       })));
     }), completes);
   });
 
   test('post without fields', () {
     expect(new CurlClient().post(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value',
       'Content-Type': 'text/plain'
     }).transform((response) {
@@ skipping 19 matching lines @@
       'other-field': 'other value'
     }).transform((response) {
       expect(response.statusCode, equals(200));
       expect(response.body, parse(equals({
         'method': 'PUT',
         'path': '/',
         'headers': {
           'content-type': [
             'application/x-www-form-urlencoded; charset=UTF-8'
           ],
-          'content-length': ['42'],
+          'content-length': ['40'],
           'x-random-header': ['Value'],
           'x-other-header': ['Other Value']
         },
-        'body': 'some-field=value&other-field=other%20value'
+        'body': 'some-field=value&other-field=other+value'
       })));
     }), completes);
   });
 
   test('put without fields', () {
     expect(new CurlClient().put(serverUrl, headers: {
       'X-Random-Header': 'Value',
       'X-Other-Header': 'Other Value',
       'Content-Type': 'text/plain'
     }).transform((response) {
@@ skipping 135 matching lines @@
   test('without following redirects', () {
     var request = new http.Request('GET', serverUrl.resolve('/redirect'));
     request.followRedirects = false;
     expect(new CurlClient().send(request).chain(http.Response.fromStream)
         .transform((response) {
       expect(response.statusCode, equals(302));
       expect(response.isRedirect, true);
     }), completes);
   });
 }