Skip to content

Commit f04ea0b

Browse files
Merge pull request #312 from canjs/remove-observe
Removing can-observe from test that doesn't need it (for IE 11 support)
2 parents 114af80 + 16f7e70 commit f04ea0b

12 files changed

+10
-35
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"postpublish": "git push --tags && git push",
1818
"testee": "testee test/test.html --browsers firefox",
1919
"test": "npm run detect-cycle && npm run jshint && npm run testee",
20-
"jshint": "jshint ./*.js --config",
20+
"jshint": "jshint ./*.js test/*.js --config",
2121
"release:pre": "npm version prerelease && npm publish --tag=pre",
2222
"release:patch": "npm version patch && npm publish",
2323
"release:minor": "npm version minor && npm publish",

test/component-can-bind-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var Component = require("can-component");
33
var helpers = require("./helpers");
44
var QUnit = require("steal-qunit");
55
var SimpleMap = require("can-simple-map");
6-
var stache = require("can-stache");
76
var value = require("can-value");
87

98
QUnit.module("can-component integration with can-bind");

test/component-define-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ QUnit.test("ViewModel properties default to DefineList if set to an Array (#225)
220220
});
221221

222222
testHelpers.dev.devOnlyTest("filename should be passed to stache() for inline views", function() {
223-
var MyComponent = Component.extend({
223+
Component.extend({
224224
tag: "my-filename-component",
225225
ViewModel: {},
226226
view: "{{scope.filename}}"

test/component-events-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ helpers.makeTests("can-component events", function(){
200200

201201

202202
QUnit.test('DOM trees not releasing when referencing CanMap inside CanMap in view (#1593)', function() {
203-
var undo = domEvents.addEvent(removedEvent)
203+
var undo = domEvents.addEvent(removedEvent);
204204

205205
var baseTemplate = stache('{{#if show}}<my-outside></my-outside>{{/if}}'),
206206
show = new SimpleObservable(true),

test/component-helpers-test.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
var QUnit = require("steal-qunit");
22

33
var helpers = require("./helpers");
4-
var SimpleMap = require("can-simple-map");
54
var stache = require("can-stache");
65
var Component = require("can-component");
76

8-
var innerHTML = function(el){
9-
return el && el.innerHTML;
10-
};
11-
127
helpers.makeTests("can-component helpers", function(){
138

149
QUnit.test("helpers reference the correct instance (#515)", function () {

test/component-in-stache-test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ var stache = require("can-stache");
55
var canReflect = require("can-reflect");
66
var QUnit = require("steal-qunit");
77

8-
var viewModel = require("can-view-model");
9-
var canDev = require("can-log/dev/dev");
10-
var testHelpers = require("can-test-helpers");
118
var domMutate = require("can-dom-mutate");
129
var globals = require("can-globals");
1310

@@ -138,7 +135,7 @@ QUnit.test("Cleans up itself on the documentElement removal", function() {
138135
globals.setKeyValue("document", realDoc);
139136
QUnit.ok(true, "Called back without throwing");
140137
start();
141-
})
138+
});
142139

143140
stop();
144141

test/component-instantiation-test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ QUnit.test("Components can be instantiated with viewModel", function() {
179179
nullProp: null
180180
}
181181
});
182-
var element = componentInstance.element;
183182
var viewModel = componentInstance.viewModel;
184183

185184
// Initial values are correct
@@ -326,7 +325,7 @@ QUnit.test("component instantiation is not observable", function(){
326325
});
327326

328327
var view = stache("<outer-component-creator/>");
329-
frag = view();
328+
view();
330329

331330
innerViewModel.innerValue = "SOME-VALUE";
332331

test/component-slot-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ test("<can-slot> Context one-way binding works", function() {
210210

211211
equal(frag.firstChild.firstChild.innerHTML, 'Later Gator');
212212
});
213-
var queues = require("can-queues");
214213

215214
test("<can-slot> Context two-way binding works", function() {
216215
/*Passing in a custom context like <can-slot name='subject' {(context)}='value' />*/

test/component-tag-test.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
var QUnit = require("steal-qunit");
22

3-
var helpers = require("./helpers")
3+
var helpers = require("./helpers");
44
var SimpleMap = require("can-simple-map");
55
var stache = require("can-stache");
66
var Component = require("can-component");
7-
var canViewModel = require('can-view-model');
8-
var SetterObservable = require("can-simple-observable/setter/setter");
9-
var SimpleObservable = require("can-simple-observable");
10-
var domMutateNode = require('can-dom-mutate/node');
11-
12-
var innerHTML = function(el){
13-
return el && el.innerHTML;
14-
};
157

168
helpers.makeTests("can-component tag", function(){
179

test/component-view-test.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ var queues = require("can-queues");
1414
var getFragment = require("can-fragment");
1515
var viewCallbacks = require("can-view-callbacks");
1616
var Scope = require("can-view-scope");
17-
var observe = require("can-observe");
1817

1918
var innerHTML = function(el){
2019
return el && el.innerHTML;
@@ -267,8 +266,6 @@ helpers.makeTests("can-component views", function(doc, runTestInOnlyDocument){
267266
equal( innerHTML(frag.firstChild), '', 'child component is removed');
268267
});
269268

270-
var queues = require("can-queues");
271-
272269
QUnit.test("references scopes are available to bindings nested in components (#2029)", function(){
273270

274271
var renderer = stache('<export-er value:to="scope.vars.reference" />'+

0 commit comments

Comments
 (0)