Skip to content

Loading…

More functests fixes #675

Merged
merged 3 commits into from

2 participants

@imalberto
Yahoo Inc. member

Only remaining failing tests are related to html5app and intl related.

@caridy

+1, I might be wrong, but @drewfish was fixing a similar issue, there might be conflicts.

@imalberto imalberto merged commit 9251274 into yahoo:develop-perf

1 check was pending

Details default The Travis build is in progress
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 26, 2012
  1. @imalberto
  2. @imalberto
Commits on Oct 29, 2012
  1. @imalberto
View
2 examples/developer-guide/adding_view_engines/mojits/myMojit/models/foo.server.js
@@ -34,4 +34,4 @@ YUI.add('myMojitModelFoo', function(Y, NAME) {
};
-}, '0.0.1', {requires: []});
+}, '0.0.1', {requires: ['mojito']});
View
13 examples/developer-guide/configure_routing/mojits/RoutingMojit/controller.server.js
@@ -15,21 +15,22 @@ YUI.add('RoutingMojit', function(Y, NAME) {
path = ac.http.getRequest().url,
routes = ac.config.getRoutes();
if (action === "index" && path === "/") {
- name = routes.root_route.name;
- Object.keys(routes.root_route.verbs).forEach(function(n) {
+ name = "root_route";
+ routes.root_route.verbs.forEach(function(n) {
methods += n + ", ";
});
} else if (action==="index") {
- name = routes.index_route.name;
- Object.keys(routes.index_route.verbs).forEach(function(n) {
+ name = "index_route";
+ routes.index_route.verbs.forEach(function(n) {
methods += n + ", ";
});
} else {
- name = routes.show_route.name;
- Object.keys(routes.show_route.verbs).forEach(function(n) {
+ name = "show_route";
+ routes.show_route.verbs.forEach(function(n) {
methods += n + ", ";
});
}
+ methods = methods.toUpperCase();
return {
"path": path,
"name": name,
View
2 examples/developer-guide/inter-mojit/mojits/ReceiverMojit/controller.server.js
@@ -27,4 +27,4 @@ YUI.add('ReceiverMojit', function (Y, NAME) {
}
};
-}, '0.0.1', {requires: ['mojito', 'mojito-params-done']});
+}, '0.0.1', {requires: ['mojito', 'mojito-params-addon']});
View
2 tests/func/examples/developerguide/test_framed_config.js
@@ -13,7 +13,7 @@ YUI({
"test framedconfig": function() {
Y.Assert.areEqual("HTML Frame Configuration Example", Y.one('h3').get('innerHTML').match(/HTML Frame Configuration Example/gi));
- Y.Assert.areEqual("This mojit should be framed with proper <HTML> tags.", Y.all('div').item(2).get('innerHTML').match(/This mojit should be framed with proper <HTML> tags./gi));
+ Y.Assert.areEqual("This mojit should be framed with proper <HTML> tags.", Y.all('div').item(1).get('innerHTML').match(/This mojit should be framed with proper <HTML> tags./gi));
}
}));
View
1 tests/unit/lib/app/addons/rs/test-config.server.js
@@ -262,7 +262,6 @@ YUI().use('addon-rs-config', 'mojito-util', 'base', 'oop', 'test', function(Y) {
}
}
}
-
}
}
},
Something went wrong with that request. Please try again.