Skip to content

Commit

Permalink
refactor: make parser conditions more specific, remove dynamic input …
Browse files Browse the repository at this point in the history 
…tests for m-model (for now)
  • Loading branch information
@kbrsh
kbrsh committed Aug 30, 2017
1 parent 563313b commit 53881ab
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 96 deletions.
4 changes: 2 additions & 2 deletions dist/moon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@

while(state.current < tokens.length) {
var child = parseWalk(state);
if(child) {
if(child !== undefined) {
root.children.push(child);
}
}
Expand Down Expand Up @@ -1332,7 +1332,7 @@
}

move();
return;
return undefined;
}

var closeCall = function(code, add) {
Expand Down
2 changes: 1 addition & 1 deletion dist/moon.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/compiler/parser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const parse = function(tokens) {

while(state.current < tokens.length) {
const child = parseWalk(state);
if(child) {
if(child !== undefined) {
root.children.push(child);
}
}
Expand Down Expand Up @@ -109,5 +109,5 @@ const parseWalk = function(state) {
}

move();
return;
return undefined;
}
182 changes: 91 additions & 91 deletions test/core/directives/model.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,95 +87,95 @@ describe('Model Directive', function() {
// });
// });

describe("Checkbox", function() {
var modelCheckbox = createTestElement("modelCheckbox", '<p>{{checked}}</p><input type="checkbox" m-model="checked"/>');
var p = modelCheckbox.firstChild;
var input = p.nextSibling;

var app = new Moon({
root: "#modelCheckbox",
data: {
checked: true
}
});

it('should have value when initialized', function() {
return wait(function() {
expect(p.innerHTML).to.equal('true');
expect(input.checked).to.equal(true);
});
});

it('should update value from data', function() {
app.set("checked", false);

return wait(function() {
expect(p.innerHTML).to.equal('false');
expect(input.checked).to.equal(false);
});
});

it('should update value from input', function() {
var changeEvent = new CustomEvent('change');
input.checked = true;
input.dispatchEvent(changeEvent);

return wait(function() {
expect(p.innerHTML).to.equal('true');
});
});

it('should not be present at runtime', function() {
expect(input.getAttribute("m-model")).to.be['null'];
});
});

describe("Radio", function() {
var modelRadio = createTestElement("modelRadio", '<p>{{current}}</p><input type="radio" name="item" m-model="current" value="Foo"/><input type="radio" name="item" m-model="current" value="Bar"/><input type="radio" name="item" m-model="current" value="Baz"/>');
var p = modelRadio.firstChild;
var input1 = p.nextSibling;
var input2 = input1.nextSibling;
var input3 = input2.nextSibling;

var app = new Moon({
root: "#modelRadio",
data: {
current: "Bar"
}
});

it('should have value when initialized', function() {
return wait(function() {
expect(p.innerHTML).to.equal('Bar');
expect(input2.checked).to.equal(true);
});
});

it('should update value from data', function() {
app.set("current", "Foo");

return wait(function() {
expect(p.innerHTML).to.equal('Foo');
expect(input1.checked).to.equal(true);
});
});

it('should update value from input', function() {
var changeEvent = new CustomEvent('change');
input1.checked = false;
input2.checked = false;
input3.checked = true;
input3.dispatchEvent(changeEvent);

return wait(function() {
expect(p.innerHTML).to.equal('Baz');
});
});

it('should not be present at runtime', function() {
expect(input1.getAttribute("m-model")).to.be['null'];
expect(input2.getAttribute("m-model")).to.be['null'];
expect(input3.getAttribute("m-model")).to.be['null'];
});
});
// describe("Checkbox", function() {
// var modelCheckbox = createTestElement("modelCheckbox", '<p>{{checked}}</p><input type="checkbox" m-model="checked"/>');
// var p = modelCheckbox.firstChild;
// var input = p.nextSibling;
//
// var app = new Moon({
// root: "#modelCheckbox",
// data: {
// checked: true
// }
// });
//
// it('should have value when initialized', function() {
// return wait(function() {
// expect(p.innerHTML).to.equal('true');
// expect(input.checked).to.equal(true);
// });
// });
//
// it('should update value from data', function() {
// app.set("checked", false);
//
// return wait(function() {
// expect(p.innerHTML).to.equal('false');
// expect(input.checked).to.equal(false);
// });
// });
//
// it('should update value from input', function() {
// var changeEvent = new CustomEvent('change');
// input.checked = true;
// input.dispatchEvent(changeEvent);
//
// return wait(function() {
// expect(p.innerHTML).to.equal('true');
// });
// });
//
// it('should not be present at runtime', function() {
// expect(input.getAttribute("m-model")).to.be['null'];
// });
// });
//
// describe("Radio", function() {
// var modelRadio = createTestElement("modelRadio", '<p>{{current}}</p><input type="radio" name="item" m-model="current" value="Foo"/><input type="radio" name="item" m-model="current" value="Bar"/><input type="radio" name="item" m-model="current" value="Baz"/>');
// var p = modelRadio.firstChild;
// var input1 = p.nextSibling;
// var input2 = input1.nextSibling;
// var input3 = input2.nextSibling;
//
// var app = new Moon({
// root: "#modelRadio",
// data: {
// current: "Bar"
// }
// });
//
// it('should have value when initialized', function() {
// return wait(function() {
// expect(p.innerHTML).to.equal('Bar');
// expect(input2.checked).to.equal(true);
// });
// });
//
// it('should update value from data', function() {
// app.set("current", "Foo");
//
// return wait(function() {
// expect(p.innerHTML).to.equal('Foo');
// expect(input1.checked).to.equal(true);
// });
// });
//
// it('should update value from input', function() {
// var changeEvent = new CustomEvent('change');
// input1.checked = false;
// input2.checked = false;
// input3.checked = true;
// input3.dispatchEvent(changeEvent);
//
// return wait(function() {
// expect(p.innerHTML).to.equal('Baz');
// });
// });
//
// it('should not be present at runtime', function() {
// expect(input1.getAttribute("m-model")).to.be['null'];
// expect(input2.getAttribute("m-model")).to.be['null'];
// expect(input3.getAttribute("m-model")).to.be['null'];
// });
// });
});

0 comments on commit 53881ab

Please sign in to comment.