Merge branch 'content-shell-ready-state' into stable
Closes #3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9b16e6..fbe48c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##0.11.5+2
+
+* Properly detect when tests are finished being run on content shell.
+
##0.11.5+1
* Internal code cleanups and documentation improvements.
diff --git a/lib/test_controller.js b/lib/test_controller.js
index 8a62d6a..40693af 100644
--- a/lib/test_controller.js
+++ b/lib/test_controller.js
@@ -160,7 +160,11 @@
}
document.addEventListener('readystatechange', function () {
- if (document.readyState != "loaded") return;
+ // Most browsers set readyState to "loaded", but some (such as Chrome content
+ // shell) set it to "complete" instead.
+ if (document.readyState != "loaded" && document.readyState != "complete") {
+ return;
+ }
// If 'startedDartTest' is not set, that means that the test did not have
// a chance to load. This will happen when a load error occurs in the VM.
// Give the machine time to start up.
diff --git a/pubspec.yaml b/pubspec.yaml
index 29bdde0..be4e923 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: unittest
-version: 0.11.5+1
+version: 0.11.5+2
author: Dart Team <misc@dartlang.org>
description: A library for writing dart unit tests.
homepage: https://github.com/dart-lang/unittest
