Skip to content

Commit

Permalink
Merge pull request #1387 from aadsm/fix-serialization-tests
Browse files Browse the repository at this point in the history
Update montage-testing version
  • Loading branch information
asolove committed Jan 6, 2014
2 parents bf5c3e3 + 9e80081 commit e2c9181
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"htmlparser2": "~3.0.5"
},
"devDependencies": {
"montage-testing": "~0.2.0",
"montage-testing": "~0.3.0",
"mr": "~0.14.2",
"q": "0.9.6",
"q-io": "~1.7.2",
Expand Down
4 changes: 2 additions & 2 deletions test/composer/translate-composer/translate-composer-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,10 @@ TestPageLoader.queueTest("translate-composer-test", function(testPage) {
});
var touchOptions = TestPageLoader.options("translate-composer-test", {timeoutLength: 10000}, function() {console.log("translate-composer-test touch callback");});
describe("translate-composer-test touch", function () {
var testPage = TestPageLoader.testPage.init();
var testPage = TestPageLoader.testPage;
it("should load", function() {
console.group("translate-composer-touch-test");
var frameLoaded = TestPageLoader.testPage.init().loadFrame(touchOptions).then(function(theTestPage) {
var frameLoaded = TestPageLoader.testPage.loadFrame(touchOptions).then(function(theTestPage) {
theTestPage.window.Touch = function() {};
});
return testPage.loadTest(frameLoaded, touchOptions).then(function(theTestPage) {
Expand Down

0 comments on commit e2c9181

Please sign in to comment.