Index: tests/html/form_data_test.dart |
diff --git a/tests/html/form_data_test.dart b/tests/html/form_data_test.dart |
index 0ddd97db2b6b8712e8ed01a92628d0bd64c9c355..75dedcee0a3b0c4b80f76a61eb0acb9c504e7db8 100644 |
--- a/tests/html/form_data_test.dart |
+++ b/tests/html/form_data_test.dart |
@@ -5,8 +5,9 @@ |
library FormDataTest; |
import '../../pkg/unittest/lib/unittest.dart'; |
-import '../../pkg/unittest/lib/html_config.dart'; |
+import '../../pkg/unittest/lib/html_individual_config.dart'; |
import 'dart:html'; |
+import 'dart:uri'; |
void fail(message) { |
guardAsync(() { |
@@ -17,56 +18,75 @@ void fail(message) { |
void main() { |
// TODO(efortuna): This is a bad test. Revisit when we have tests that can run |
// both a server and fire up a browser. |
- useHtmlConfiguration(); |
+ useHtmlIndividualConfiguration(); |
- var isFormData = predicate((x) => x is FormData, 'is a FormData'); |
- |
- test('constructorTest1', () { |
- var form = new FormData(); |
- expect(form, isNotNull); |
- expect(form, isFormData); |
+ group('supported', () { |
+ test('supported', () { |
+ expect(FormData.supported, isTrue); |
+ }); |
}); |
- test('constructorTest2', () { |
- var form = new FormData(new FormElement()); |
- expect(form, isNotNull); |
- expect(form, isFormData); |
- }); |
+ group('functional', () { |
+ test('unsupported throws', () { |
+ var expectation = FormData.supported ? returnsNormally : throws; |
+ expect(() { |
+ new FormData(); |
+ }, expectation); |
+ }); |
- test('appendTest', () { |
- var form = new FormData(); |
- form.append('test', '1'); |
- form.append('username', 'Elmo'); |
- form.append('address', '1 Sesame Street'); |
- form.append('password', '123456', 'foo'); |
- expect(form, isNotNull); |
- }); |
+ var isFormData = predicate((x) => x is FormData, 'is a FormData'); |
- test('appendBlob', () { |
- var form = new FormData(); |
- var blob = new Blob( |
- ['Indescribable... Indestructible! Nothing can stop it!'], |
- 'text/plain'); |
- form.append('theBlob', blob, 'theBlob.txt'); |
- }); |
+ if (FormData.supported) { |
+ test('constructorTest1', () { |
+ var form = new FormData(); |
+ expect(form, isNotNull); |
+ expect(form, isFormData); |
+ }); |
- test('send', () { |
- var form = new FormData(); |
- var blobString = 'Indescribable... Indestructible! Nothing can stop it!'; |
- var blob = new Blob( |
- [blobString], |
- 'text/plain'); |
- form.append('theBlob', blob, 'theBlob.txt'); |
+ test('constructorTest2', () { |
+ var form = new FormData(new FormElement()); |
+ expect(form, isNotNull); |
+ expect(form, isFormData); |
+ }); |
- var xhr = new HttpRequest(); |
- xhr.open("POST", "http://localhost:${window.location.port}/echo"); |
+ test('appendTest', () { |
+ var form = new FormData(); |
+ form.append('test', '1'); |
+ form.append('username', 'Elmo'); |
+ form.append('address', '1 Sesame Street'); |
+ form.append('password', '123456', 'foo'); |
+ expect(form, isNotNull); |
+ }); |
- xhr.onLoad.listen(expectAsync1((e) { |
- expect(xhr.responseText.contains(blobString), true); |
- })); |
- xhr.onError.listen((e) { |
- fail('$e'); |
- }); |
- xhr.send(form); |
+ test('appendBlob', () { |
+ var form = new FormData(); |
+ var blob = new Blob( |
+ ['Indescribable... Indestructible! Nothing can stop it!'], |
+ 'text/plain'); |
+ form.append('theBlob', blob, 'theBlob.txt'); |
+ }); |
+ |
+ test('send', () { |
+ var form = new FormData(); |
+ var blobString = |
+ 'Indescribable... Indestructible! Nothing can stop it!'; |
+ var blob = new Blob( |
+ [blobString], |
+ 'text/plain'); |
+ form.append('theBlob', blob, 'theBlob.txt'); |
+ |
+ var xhr = new HttpRequest(); |
+ xhr.open('POST', |
+ '${window.location.protocol}//${window.location.host}/echo'); |
+ |
+ xhr.onLoad.listen(expectAsync1((e) { |
+ expect(xhr.responseText.contains(blobString), true); |
+ })); |
+ xhr.onError.listen((e) { |
+ fail('$e'); |
+ }); |
+ xhr.send(form); |
+ }); |
+ } |
}); |
} |