aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJeff Cross2013-08-02 09:21:33 -0700
committerJeff Cross2013-08-09 10:19:41 -0700
commit0b114fd3e1ce4cc120663222f2dfb34ee5dbda4c (patch)
tree1330fc8161d804d6c2ebffe6a76f8e0da3cb5cde /test
parent61cb4085d421060edfb98d7eae0a43b615542843 (diff)
downloadangular.js-0b114fd3e1ce4cc120663222f2dfb34ee5dbda4c.tar.bz2
fix(docs-bootstrap): Removed injector from bootstrapped docs samples
This is necessary to make e2e tests pass for implementing #3411. At present, the docs are violating the rule being enforced by double-bootstrap prevention.
Diffstat (limited to 'test')
-rw-r--r--test/jqLiteSpec.js14
-rw-r--r--test/testabilityPatch.js2
2 files changed, 15 insertions, 1 deletions
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
index abfad064..913e6192 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -126,6 +126,20 @@ describe('jqLite', function() {
dealoc(doc);
}
);
+
+ it('should return null values', function () {
+ var ul = jqLite('<ul><li><p><b>deep deep</b><p></li></ul>'),
+ li = ul.find('li'),
+ b = li.find('b');
+
+ ul.data('foo', 'bar');
+ li.data('foo', null);
+ expect(b.inheritedData('foo')).toBe(null);
+ expect(li.inheritedData('foo')).toBe(null);
+ expect(ul.inheritedData('foo')).toBe('bar');
+
+ dealoc(ul);
+ });
});
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index 7b4fe0ec..514a5fdb 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -56,7 +56,7 @@ afterEach(function() {
forEachSorted(cache, function(expando, key){
angular.forEach(expando.data, function(value, key){
count ++;
- if (value.$element) {
+ if (value && value.$element) {
dump('LEAK', key, value.$id, sortedHtml(value.$element));
} else {
dump('LEAK', key, angular.toJson(value));