@@ -16,7 +16,11 @@ Monarch.module("Screw.Interface", { }, get_location: function() { - return window.location.toString(); + return window.location; + }, + + base_location: function() { + return this.get_location().href.split('?')[0]; }, examples_to_run: function() { client/lib/screw/interface.js @@ -60,7 +60,7 @@ Monarch.constructor("Screw.Interface.Description", Monarch.View.Template, { }, focus: function() { - throw new Error("Not yet implemented"); + Screw.Interface.set_location(Screw.Interface.base_location() + "?" + JSON.stringify([this.description.path()])); } } }); client/lib/screw/interface/description.js @@ -33,7 +33,7 @@ Monarch.constructor("Screw.Interface.Example", Monarch.View.Template, { }, focus: function() { - throw new Error("Not implemented yet"); + Screw.Interface.set_location(Screw.Interface.base_location() + "?" + JSON.stringify([this.example.path()])); } } }); client/lib/screw/interface/example.js @@ -11,12 +11,9 @@ Monarch.constructor("Screw.Interface.ProgressBar", Monarch.View.Template, { view_properties: { initialize: function() { var self = this; - this.total_examples = 0; - Screw.each(this.examples_to_run, function() { - self.total_examples += this.total_examples(); - this.on_example_completed(function(example) { - self.update_progress(example); - }); + this.total_examples = this.root.total_examples(); + this.root.on_example_completed(function(example) { + self.update_progress(example); }); client/lib/screw/interface/progress_bar.js @@ -3,6 +3,7 @@ Monarch.constructor("Screw.Interface.Runner", Monarch.View.Template, { constructor_properties: { run_specs_on_page_load: function() { + var self = this; jQuery(function() { var root_description = Screw.root_description(); var completed_example_count = 0; @@ -18,16 +19,26 @@ Monarch.constructor("Screw.Interface.Runner", Monarch.View.Template, { var queue = new Monarch.Queue(); var runner; queue.add(function() { - runner = Screw.Interface.Runner.to_view({root: Screw.root_description(), show: jQuery.cookie("__screw_unit__show") || "all"}); + var show = jQuery.cookie("__screw_unit__show") || "all"; + runner = Screw.Interface.Runner.to_view({root: Screw.root_description(), show: show}); }); queue.add(function() { Screw.$('body').html(runner); }); queue.add(function() { - runner.run(); + runner.run(self.run_paths()); }) queue.start(); }); + }, + + run_paths: function() { + var after_hash = Screw.Interface.get_location().href.split("?")[1]; + if (after_hash) { + return JSON.parse(after_hash); + } else { + return null; + } } }, @@ -51,7 +62,7 @@ Monarch.constructor("Screw.Interface.Runner", Monarch.View.Template, { }); }); td(function() { - subview('progress_bar', Screw.Interface.ProgressBar, {examples_to_run: Screw.Interface.examples_to_run()}); + subview('progress_bar', Screw.Interface.ProgressBar, {root: initial_attributes.root}); }); }) }) @@ -72,37 +83,55 @@ Monarch.constructor("Screw.Interface.Runner", Monarch.View.Template, { }, show_failed: function() { - jQuery.cookie("__screw_unit__show", "failed"); + jQuery.cookie("__screw_unit__show", "failed", {path: "/"}); this.addClass('show_failed'); this.removeClass('show_all'); }, show_all: function() { - jQuery.cookie("__screw_unit__show", "all"); + jQuery.cookie("__screw_unit__show", "all", {path: "/"}); this.addClass('show_all'); this.removeClass('show_failed'); }, rerun_failed: function() { - throw new Error("not implemented"); + var failing_paths = Monarch.Util.map(this.root.failed_examples(), function(example) { return example.path() }); + + + Screw.Interface.set_location(Screw.Interface.base_location() + '?' + JSON.stringify(failing_paths)); }, rerun_all: function() { - throw new Error("not implemented"); + Screw.Interface.set_location(Screw.Interface.base_location()); }, - run: function() { + run: function(run_paths) { var self = this; + var objects_to_run = []; + if (run_paths) { + Monarch.Util.each(run_paths, function(path) { + var runnable = self.root.runnable_at_path(path); + if (runnable) { + objects_to_run.push(runnable); + } else { + throw new Error("No runnable at path " + path); + } + }); + } else { + objects_to_run.push(self.root); + } + this.completed_example_count = 0; this.total_examples = Screw.root_description().total_examples(); var queue = new Monarch.Queue(); + this.root.on_example_completed(function() { self.update() } ); - Screw.root_description().on_example_completed(function() { self.update() } ); - Monarch.Util.each(Screw.Interface.examples_to_run(), function(example) { + + Monarch.Util.each(objects_to_run, function(runnable) { queue.add(function() { - example.run(); - }) + runnable.run(); + }); }); queue.start(); client/lib/screw/interface/runner.js @@ -8,8 +8,6 @@ Monarch.module("Screw.Require", { use_cache_buster: true, require: function(javascript_path, onload) { - console.debug(javascript_path); - if (Screw.Require.required_paths[javascript_path]) return; var full_path = javascript_path + ".js"; client/lib/screw/require.js @@ -167,7 +167,6 @@ Screw.Unit(function(c) { with(c) { it("returns the a message including the example's name and the error message", function() { example.run(); - console.debug(example.failure_message); expect(example.failure_message).to(match, "sad times"); }); }); client/spec/example_spec.js @@ -7,6 +7,19 @@ Screw.Unit(function(c) { with(c) { parent_description.add_description(description); }); + describe("#focus", function() { + it("sets window.location to match the path of the view's Description", function() { + view = Screw.Interface.Description.to_view({description: description, build_immediately: true}); + mock(Screw.Interface, 'get_location', function() { + return { href: "http://localhost:8080/specs?[[0]]"}; + }); + + mock(Screw.Interface, 'set_location'); + view.focus(); + expect(Screw.Interface.set_location).to(have_been_called, with_args("http://localhost:8080/specs?" + JSON.stringify([description.path()]))); + }); + }); + describe("#content", function() { context("when the view is instantiated without the build_immediately option", function() { var example_1, example_2, set_timeout_callback; client/spec/interface/description_spec.js @@ -18,6 +18,18 @@ Screw.Unit(function(c) { with(c) { }); }); + describe("#focus", function() { + it("sets window.location to match the path of the view's Example", function() { + mock(Screw.Interface, 'get_location', function() { + return { href: "http://localhost:8080/specs?[[0]]"}; + }); + + mock(Screw.Interface, 'set_location'); + view.focus(); + expect(Screw.Interface.set_location).to(have_been_called, with_args("http://localhost:8080/specs?" + JSON.stringify([example.path()]))); + }); + }); + describe("when span.name is clicked", function() { it("calls #focus on the view", function() { mock(view, 'focus'); client/spec/interface/example_spec.js @@ -23,10 +23,14 @@ Screw.Unit(function(c) { with(c) { description_2.add_example(example_3); description_2.add_example(example_4); - view = Screw.Interface.ProgressBar.to_view({examples_to_run: [description_1, description_2]}); + root = new Screw.Description('root'); + root.add_description(description_1); + root.add_description(description_2); + + view = Screw.Interface.ProgressBar.to_view({root: root}); }); - describe("when an example within one of the associated examples to run is completed", function() { + describe("when an example within the given root is completed", function() { it("updates the width of the progress bar to the proportion of completed examples and updates the 'n of m completed' text", function() { expect(view.find('div#screw_unit_progress').css('width')).to(equal, '0%'); expect(view.html()).to(match, "0 of 4"); @@ -39,7 +43,7 @@ Screw.Unit(function(c) { with(c) { }); }); - describe("when an example within the associated runnable fails", function() { + describe("when an example within the given root fails", function() { before(function() { should_fail = true; }); client/spec/interface/progress_bar_spec.js @@ -1,31 +1,82 @@ Screw.Unit(function(c) { with(c) { describe("Screw.Interface.Runner", function() { - var root, child_description_1, child_description_2, view, show; + var root, child_description_1, child_description_1_example, child_description_2, view, show; before(function() { + Screw.Monarch.Queue.synchronous = true; + root = new Screw.Description("all specs"); child_description_1 = new Screw.Description("child description 1"); child_description_2 = new Screw.Description("child description 2"); + child_description_1_example = new Screw.Example("child description 1 example", function() { }); + child_description_1.add_example(child_description_1_example); + root.add_description(child_description_1); root.add_description(child_description_2); + view = Screw.Interface.Runner.to_view({root: root, build_immediately: true, show: show}); mock(Screw.jQuery, 'cookie'); mock(Screw.jQuery, 'ajax'); }); - context("when passed the show: 'all' option", function() { - it("renders itself with the 'show_all' class and not the 'show_failed' class", function() { - view = Screw.Interface.Runner.to_view({root: root, build_immediately: true, show: 'all'}); - expect(view.hasClass("show_all")).to(be_true); - expect(view.hasClass("show_failed")).to(be_false); + init(function() { + show = 'all' + }); + + + describe(".run_paths", function() { + it("returns the string following # parsed as JSON", function() { + mock(Screw.Interface, 'get_location', function() { + return { + href: "http://localhost:8080/specs?[[1], [2,0,0]]" + } + }); + expect(Screw.Interface.Runner.run_paths()).to(equal, [[1], [2,0,0]]); }); }); - context("when passed the show: 'failed' option'", function() { - it("renders itself with the 'show_failed' class and not the 'show_all' class", function() { - view = Screw.Interface.Runner.to_view({root: root, build_immediately: true, show: 'failed'}); - expect(view.hasClass("show_failed")).to(be_true); - expect(view.hasClass("show_all")).to(be_false); + describe(".to_view", function() { + context("when passed the show: 'all' option", function() { + it("renders itself with the 'show_all' class and not the 'show_failed' class", function() { + expect(view.hasClass("show_all")).to(be_true); + expect(view.hasClass("show_failed")).to(be_false); + }); + }); + + context("when passed the show: 'failed' option'", function() { + init(function() { + show = 'failed'; + }); + + it("renders itself with the 'show_failed' class and not the 'show_all' class", function() { + expect(view.hasClass("show_failed")).to(be_true); + expect(view.hasClass("show_all")).to(be_false); + }); + }); + }); + + + describe("#run", function() { + context("when passed an array of paths as the run_paths: option", function() { + it("calls run on the examples or descriptions corresponding to the paths", function() { + mock(child_description_1, 'run'); + mock(child_description_1_example, 'run'); + mock(child_description_2, 'run'); + + view.run([[0, 0], [1]]); + + expect(child_description_1.run).to_not(have_been_called); + expect(child_description_1_example.run).to(have_been_called, once); + expect(child_description_2.run).to(have_been_called, once); + }); + }); + + context("when passed no run_paths", function() { + it("calls #run on root", function() { + mock(root, 'run'); + view.run(); + expect(root.run).to(have_been_called); + }); }); }); @@ -70,7 +121,7 @@ Screw.Unit(function(c) { with(c) { it("stores a cookie to retain the setting across refreshes", function() { view.find("button#show_failed").click(); - expect(Screw.jQuery.cookie).to(have_been_called, with_args("__screw_unit__show", "failed")); + expect(Screw.jQuery.cookie).to(have_been_called, with_args("__screw_unit__show", "failed", {path: "/"})); }); }); @@ -98,7 +149,34 @@ Screw.Unit(function(c) { with(c) { it("stores a cookie to retain the setting across refreshes", function() { view.find("button#show_all").click(); - expect(Screw.jQuery.cookie).to(have_been_called, with_args("__screw_unit__show", "all")); + expect(Screw.jQuery.cookie).to(have_been_called, with_args("__screw_unit__show", "all", {path: "/"})); + }); + }); + + describe("when the Rerun All button is clicked", function() { + it("sets window.location to the current path, without any path specifier", function() { + mock(Screw.Interface, 'get_location', function() { + return { href: "http://localhost:8080/specs?[[0]]"}; + }); + + mock(Screw.Interface, 'set_location'); + view.find("button#rerun_all").click(); + expect(Screw.Interface.set_location).to(have_been_called, with_args("http://localhost:8080/specs")); + }); + }); + + describe("when the Rerun Failed button is clicked", function() { + it("sets window.location to the paths of all currently failing examples", function() { + view.run(); + mock(Screw.Interface, 'get_location', function() { + return { href: "http://localhost:8080/specs?[[0]]"}; + }); + mock(Screw.Interface, 'set_location'); + + view.find("button#rerun_failed").click(); + + expect(Screw.Interface.set_location).to(have_been_called); + expect(Screw.Interface.set_location).to(have_been_called, with_args("http://localhost:8080/specs?" + JSON.stringify([failing_example_1.path(), failing_example_2.path()]))); }); }); }); @@ -132,11 +210,10 @@ Screw.Unit(function(c) { with(c) { mock(Screw.root_description(), "failed_examples", function() { return []; }); }); - it("adds the .passed class to the root description", function() { - view.update(); - expect(Screw.root_description().failed_examples).to(have_been_called, once); - expect(view.find("ul.descriptions").hasClass("passed")).to(be_true); + view.update(); + expect(Screw.root_description().failed_examples).to(have_been_called, once); + expect(view.find("ul.descriptions").hasClass("passed")).to(be_true); }); }); }); client/spec/interface/runner_spec.js 858f427814647731da3f87ed1a982423078d7f06 Grockit grockit@grok-a.local http://github.com/nathansobo/screw-unit/commit/a3e5530a276282eda8469fd58398fd5c6c0eea3c a3e5530a276282eda8469fd58398fd5c6c0eea3c 2009-10-13T16:04:11-07:00 2009-10-13T16:04:11-07:00 Restored focused spec running capability 53ffe7628e16326fc56a57be718363e5217c19ed Grockit grockit@grok-a.local