diff --git a/spec/javascripts/hello_world_fuck_you_spec.js b/spec/javascripts/hello_world_fuck_you_spec.js index 40510ee..3fb4675 100644 --- a/spec/javascripts/hello_world_fuck_you_spec.js +++ b/spec/javascripts/hello_world_fuck_you_spec.js @@ -2,9 +2,10 @@ describe('hello_world', function() { it("should tell us 'fuck you' when you click the h1", function() { - template("hello_world.jasmine_fixture"); - expect($('#test h1').text()).toNotContain("Fuck You"); - //$("h1").click(); -// expect($('#test h1').text()).toContain("Fuck You"); + spec.loadFixture("hello_world"); + expect($('h1').text()).toNotContain("Fuck you"); + $("h1").click(); + console.log($("h1").text()); + expect($('h1').text()).toContain("Fuck you"); }); }); diff --git a/spec/javascripts/helpers/jasmine-fixture-loader.js b/spec/javascripts/helpers/jasmine-fixture-loader.js index ee754fa..d59e3a3 100644 --- a/spec/javascripts/helpers/jasmine-fixture-loader.js +++ b/spec/javascripts/helpers/jasmine-fixture-loader.js @@ -43,7 +43,7 @@ spec.fixtureHtml = function(fixtureName) { spec.retrieveFixture = function(fixtureName) { // construct a path to the fixture, including a cache-busting timestamp - var path = '/tmp/jasmine_fixtures/' + fixtureName + ".jasmine_fixture?" + new Date().getTime(); + var path = 'tmp/jasmine_fixtures/' + fixtureName + ".jasmine_fixture?" + new Date().getTime(); var xhr; // retrieve the fixture markup via xhr request to jasmine server diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 6c84400..d2984e4 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -11,7 +11,7 @@ # - dist/**/*.js # src_files: - - public/javascripts/prototype.js + - public/javascripts/jquery.js - public/javascripts/effects.js - public/javascripts/controls.js - public/javascripts/dragdrop.js