Skip to content

Commit

Permalink
Commented out the problem unit test. Will discuss with @brianbaker ab…
Browse files Browse the repository at this point in the history 
…out a fix for it.
  • Loading branch information
Ali Khatami authored and Ali Khatami committed Mar 27, 2013
1 parent ca4548e commit 551e445
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/spec/container-spec.js
View file
Expand Up @@ -137,13 +137,13 @@ describe('F2.registerApps - rendering', function() {

F2.registerApps(appConfig, [appManifest]);
});

/*
it('should eval AppManifest.inlineScripts when AppManifest.scripts are defined', function(){
F2.init();
F2.registerApps([{appId:'com_openf2_tests_helloworld', manifestUrl:'/'}], [{"inlineScripts": ["(function(){F2.inlineScriptsEvaluated=true;})()"], "scripts":["tests/js/test.js"],"apps":[{}]}]);
F2.registerApps([{appId:'com_openf2_tests_helloworld', manifestUrl:'/'}], [{"inlineScripts": ["(function(){F2.inlineScriptsEvaluated=true;})()"], "scripts":["http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js"],"apps":[{}]}]);
expect(F2.inlineScriptsEvaluated).not.toBeUndefined();
});

*/
it('should eval AppManifest.inlineScripts when AppManifest.scripts are not defined', function(){
F2.init();
F2.registerApps([{appId:'com_openf2_tests_helloworld', manifestUrl:'/'}], [{"inlineScripts": ["(function(){F2.inlineScriptsEvaluated=true;})()"],"apps":[{}]}]);
Expand Down

3 comments on commit 551e445

@brianbaker
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @markhealey added that for OpenF2#44.

@Ali-Khatami
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya I need to do some more testing with Travis CI/ Phantom-JS to figure out why we can't load files. It looks like a relative pathing issue. I might make a helper method for Jasmine to solve that issue, but will do more testing before adding anything.

@Ali-Khatami
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a fix for this in my 1.3-wip-app-handlers branch the unit tests themselves weren't working 100% correctly. I also added logic to allow us to access cross domain and do local ajax. I'll update this thread when the branch is merged into 1.3-wip on OpenF2/F2.

Please sign in to comment.