public/javascripts/views/login_view.js @@ -67,7 +67,7 @@ module AuthenticatedSystem redirect_to new_session_path end format.json do - render :json => {'type' => 'Redirect', 'attributes' => {'href' => new_session_path}} + render :json => {'type' => 'Login'} end format.any do request_http_basic_authentication 'Web Password' lib/authenticated_system.rb @@ -40,13 +40,11 @@ contentType: "application/json", dataType: "json", success: function(data) { - if(data.type == "Redirect") { - self.location.href = data.attributes.href; + if(data.type == "Login") { + if(callback) callback(data); } else { update_attributes.call(self, data.attributes); - if(callback) { - callback(self); - } + if(callback) callback(self); } } }); public/javascripts/models/pain_point.js @@ -1,4 +1,4 @@ -(function() { +(function($) { window.PainPointsView = { 'create': function() { var b = new XmlBuilder({binding: this}); @@ -11,4 +11,4 @@ return content; } }; -})(); \ No newline at end of file +})(jQuery); \ No newline at end of file public/javascripts/views/pain_points_view.js @@ -51,6 +51,30 @@ Screw.Unit(function() { }); }); + this["when the server responds with a Login"] = function(method_name) { + describe("when the server responds with a Login", function() { + describe("when passing in a callback", function() { + it("invokes the callback with the Login instance", function() { + var callback_object; + var callback = function(object) { + callback_object = object; + } + pain_point[method_name](callback); + + ActiveAjaxRequests[0].success({"type": "Login"}); + expect(callback_object).to(equal, {"type": "Login"}) + }); + }); + + describe("when not passing in a callback", function() { + it("does nothing", function() { + pain_point[method_name](); + ActiveAjaxRequests[0].success({"type": "Login"}); + }); + }); + }); + } + describe("#up_vote", function() { before(function() { window._token = "foobar"; @@ -80,18 +104,7 @@ Screw.Unit(function() { expect(pain_point.score).to(equal, 5); }); - describe("when the server responds with a Redirect", function() { - it("sets the window.href to value of the location", function() { - var location = {}; - pain_point.location = location; - pain_point.up_vote(); - - ActiveAjaxRequests[0].success( - {"type": "Redirect", "attributes": {"href": "/sessions/new"}} - ); - expect(location.href).to(equal, "/sessions/new"); - }); - }); + this["when the server responds with a Login"]('up_vote'); }); }); @@ -123,18 +136,7 @@ Screw.Unit(function() { expect(pain_point.vote_state).to(equal, 'down'); }); - describe("when the server responds with a Redirect", function() { - it("sets the window.href to value of the location", function() { - var location = {}; - pain_point.location = location; - pain_point.down_vote(); - - ActiveAjaxRequests[0].success( - {"type": "Redirect", "attributes": {"href": "/sessions/new"}} - ); - expect(location.href).to(equal, "/sessions/new"); - }); - }); + this["when the server responds with a Login"]('down_vote'); }); }); }); spec/javascripts/models/pain_point_spec.js @@ -2,6 +2,7 @@ require("/implementations/xmlbuilder"); require("/implementations/json2"); require("/implementations/models/pain_point"); +require("/implementations/views/login_view"); require("/implementations/views/pain_point_view"); require("/implementations/views/pain_points_view"); require("/specs/fake_jQuery_ajax"); @@ -9,6 +10,7 @@ require("/specs/fake_jQuery_ajax"); Screw.Unit(function() { before(function() { + $("body > .overlay").remove(); $("#screw_unit_content").html(""); ActiveAjaxRequests.length = 0; PainPoint.instances = []; spec/javascripts/spec_helper.js @@ -9,16 +9,16 @@ Screw.Unit(function() { }) it("renders a li element with an up vote, down vote, and an edit link", function() { - var output = PainPointView.create(pain_point); - expect(output.find("a.up")).to_not(be_empty); - expect(output.find("a.down")).to_not(be_empty); - expect(output.find("a[@href='/pain_points/1/edit']")).to_not(be_empty); + var view = PainPointView.create(pain_point); + expect(view.find("a.up")).to_not(be_empty); + expect(view.find("a.down")).to_not(be_empty); + expect(view.find("a[@href='/pain_points/1/edit']")).to_not(be_empty); }); describe("PainPoint#score", function() { it("renders the score", function() { - var output = PainPointView.create(pain_point); - expect(output.html()).to(match, pain_point.score.toString()); + var view = PainPointView.create(pain_point); + expect(view.html()).to(match, pain_point.score.toString()); }); }); @@ -29,9 +29,9 @@ Screw.Unit(function() { }); it("renders neither the up vote or down vote link as selected", function() { - var output = PainPointView.create(pain_point); - expect(output.find("a.up.selected")).to(be_empty); - expect(output.find("a.down.selected")).to(be_empty); + var view = PainPointView.create(pain_point); + expect(view.find("a.up.selected")).to(be_empty); + expect(view.find("a.down.selected")).to(be_empty); }); }); @@ -41,9 +41,9 @@ Screw.Unit(function() { }); it("renders the up vote link as selected", function() { - var output = PainPointView.create(pain_point); - expect(output.find("a.up.selected")).to_not(be_empty); - expect(output.find("a.down.selected")).to(be_empty); + var view = PainPointView.create(pain_point); + expect(view.find("a.up.selected")).to_not(be_empty); + expect(view.find("a.down.selected")).to(be_empty); }); }); @@ -53,9 +53,9 @@ Screw.Unit(function() { }); it("renders the down vote link as selected", function() { - var output = PainPointView.create(pain_point); - expect(output.find("a.up.selected")).to(be_empty); - expect(output.find("a.down.selected")).to_not(be_empty); + var view = PainPointView.create(pain_point); + expect(view.find("a.up.selected")).to(be_empty); + expect(view.find("a.down.selected")).to_not(be_empty); }); }); }); @@ -65,57 +65,64 @@ Screw.Unit(function() { describe("#refresh", function() { before(function() { pain_point = new PainPoint({id: 1, name: "Pain Point 1", vote_state: "neutral", score: 0}); - output = PainPointView.create(pain_point); + view = PainPointView.create(pain_point); }); describe("PainPoint#score > 0", function() { it("renders the score", function() { pain_point.score = 1; - output.refresh(pain_point); - expect(output.find(".score").html()).to(equal, "1"); + view.refresh(pain_point); + expect(view.find(".score").html()).to(equal, "1"); }) }); describe("PainPoint#score == 0", function() { it("renders the score", function() { pain_point.score = 0; - output.refresh(pain_point); - expect(output.find(".score").html()).to(equal, "0"); + view.refresh(pain_point); + expect(view.find(".score").html()).to(equal, "0"); }) }); describe("PainPoint#score < 0", function() { it("renders the score", function() { pain_point.score = -1; - output.refresh(pain_point); - expect(output.find(".score").html()).to(equal, "-1"); + view.refresh(pain_point); + expect(view.find(".score").html()).to(equal, "-1"); }) }); }); describe("#up_vote.click", function() { - var output; + var view, link; before(function() { pain_point = new PainPoint({id: 1, name: "Pain Point 1", vote_state: "neutral", score: 0}); - output = PainPointView.create(pain_point); + view = PainPointView.create(pain_point); + link = view.find("a.up"); }); it("sends a POST to /pain_points/:pain_point_id/up_vote", function() { - output.find("a.up").click(); + view.find("a.up").click(); expect(ActiveAjaxRequests.length).to(equal, 1); var request = ActiveAjaxRequests[0]; expect(request.type).to(equal, 'POST'); expect(request.url).to(equal, '/pain_points/1/up_vote'); }); - describe("processing the server response", function() { + describe("when the server responds with a Login", function() { + it("causes login form to show itself", function() { + + }); + }); + + describe("when the server responds with a PainPoint", function() { describe("PainPoint#vote_state", function() { describe("up", function() { it("adds the 'selected' up vote link css class and removes 'selected' from the down vote link css class", function() { - output.find("a.down").addClass("selected"); - expect(output.find("a.up.selected")).to(be_empty); - expect(output.find("a.down.selected")).to_not(be_empty); - output.find("a.up").click(); + view.find("a.down").addClass("selected"); + expect(view.find("a.up.selected")).to(be_empty); + expect(view.find("a.down.selected")).to_not(be_empty); + link.click(); ActiveAjaxRequests[0].success( { 'type': "PainPoint", @@ -123,19 +130,19 @@ Screw.Unit(function() { } ); - expect(output.find("a.up.selected")).to_not(be_empty); - expect(output.find("a.down.selected")).to(be_empty); + expect(view.find("a.up.selected")).to_not(be_empty); + expect(view.find("a.down.selected")).to(be_empty); }); }); describe("neutral", function() { it("removes the 'selected' up vote link and down vote link css classes", function() { - output.find("a.up").addClass("selected"); - expect(output.find("a.up.selected")).to_not(be_empty); - output.find("a.down").addClass("selected"); - expect(output.find("a.down.selected")).to_not(be_empty); + view.find("a.up").addClass("selected"); + expect(view.find("a.up.selected")).to_not(be_empty); + view.find("a.down").addClass("selected"); + expect(view.find("a.down.selected")).to_not(be_empty); - output.find("a.up").click(); + link.click(); ActiveAjaxRequests[0].success( { 'type': "PainPoint", @@ -143,17 +150,17 @@ Screw.Unit(function() { } ); - expect(output.find("a.up.selected")).to(be_empty); - expect(output.find("a.down.selected")).to(be_empty); + expect(view.find("a.up.selected")).to(be_empty); + expect(view.find("a.down.selected")).to(be_empty); }); }); }); describe("PainPoint#score", function() { it("renders the updated score", function() { - expect(output.find(".score").html()).to_not(equal, "5"); + expect(view.find(".score").html()).to_not(equal, "5"); - output.find("a.up").click(); + link.click(); ActiveAjaxRequests[0].success( { 'type': "PainPoint", @@ -161,7 +168,7 @@ Screw.Unit(function() { } ); - expect(output.find(".score").html()).to(equal, "5"); + expect(view.find(".score").html()).to(equal, "5"); }) }); }); @@ -169,14 +176,14 @@ Screw.Unit(function() { }) describe("#down_vote.click", function() { - var output; + var view; before(function() { pain_point = new PainPoint({id: 1, name: "Pain Point 1", vote_state: "neutral", score: 0}); - output = PainPointView.create(pain_point); + view = PainPointView.create(pain_point); }); it("sends a POST to /pain_points/:pain_point_id/down_vote", function() { - output.find("a.down").click(); + view.find("a.down").click(); expect(ActiveAjaxRequests.length).to(equal, 1); var request = ActiveAjaxRequests[0]; expect(request.type).to(equal, 'POST'); @@ -187,41 +194,41 @@ Screw.Unit(function() { describe("PainPoint#vote_state", function() { describe("down", function() { it("adds the 'selected' down vote link css class and removes the 'selected' up vote link css class", function() { - output.find("a.up").addClass('selected'); - expect(output.find("a.up.selected")).to_not(be_empty); - expect(output.find("a.down.selected")).to(be_empty); - output.find("a.down").click(); + view.find("a.up").addClass('selected'); + expect(view.find("a.up.selected")).to_not(be_empty); + expect(view.find("a.down.selected")).to(be_empty); + view.find("a.down").click(); ActiveAjaxRequests[0].success( {'type': "PainPoint", 'attributes': {id: 1, name: "Pain Point 1", vote_state: "down", score: 1}} ); - expect(output.find("a.up.selected")).to(be_empty); - expect(output.find("a.down.selected")).to_not(be_empty); + expect(view.find("a.up.selected")).to(be_empty); + expect(view.find("a.down.selected")).to_not(be_empty); }); }); describe("neutral", function() { it("removes the 'selected' down vote and up vote link css class", function() { - output.find("a.up").addClass("selected"); - output.find("a.down").addClass("selected"); - expect(output.find("a.up.selected")).to_not(be_empty); - expect(output.find("a.down.selected")).to_not(be_empty); - output.find("a.down").click(); + view.find("a.up").addClass("selected"); + view.find("a.down").addClass("selected"); + expect(view.find("a.up.selected")).to_not(be_empty); + expect(view.find("a.down.selected")).to_not(be_empty); + view.find("a.down").click(); ActiveAjaxRequests[0].success( {'type': "PainPoint", 'attributes': {id: 1, name: "Pain Point 1", vote_state: "neutral", score: 3}} ); - expect(output.find("a.up.selected")).to(be_empty); - expect(output.find("a.down.selected")).to(be_empty); + expect(view.find("a.up.selected")).to(be_empty); + expect(view.find("a.down.selected")).to(be_empty); }); }); }); describe("PainPoint#score", function() { it("renders the updated score", function() { - expect(output.find(".score").html()).to_not(equal, "-5"); + expect(view.find(".score").html()).to_not(equal, "-5"); - output.find("a.down").click(); + view.find("a.down").click(); ActiveAjaxRequests[0].success( { 'type': "PainPoint", @@ -229,7 +236,7 @@ Screw.Unit(function() { } ); - expect(output.find(".score").html()).to(equal, "-5"); + expect(view.find(".score").html()).to(equal, "-5"); }) }); }); spec/javascripts/views/pain_point_view_spec.js @@ -9,7 +9,7 @@ describe "A User on the home page" do describe "when not logged in" do describe "clicking the up vote" do - it "sends a message to redirect to /login" do + it "sends a Login" do pain_point = pain_points(:slow_tests) post( pain_point_up_vote_index_path(:pain_point_id => pain_point.to_param), @@ -20,7 +20,7 @@ describe "A User on the home page" do "Cookie" => "bc_test=true; _pain-point_session=#{session_id}" ) status.should == 200 - JSON.parse(@response.body).should == {'type' => 'Redirect', 'attributes' => {'href' => new_session_path}} + JSON.parse(@response.body).should == {'type' => 'Login'} end end end spec/rails_integration/vote_submissions_spec.rb @@ -37,7 +37,9 @@ describe "A User on the home page" do before do element("css=.score").assert_contains('0') click "css=.up" - assert_location_ends_with new_session_path + pending "Client side will handle login" do + assert_location_ends_with new_session_path + end @user = users(:quentin) element("link=Login").click element("name=login").type(user.login) spec/selenium/vote_submissions_spec.rb 7fad954a16dc46226900fb1a99e2a1f8b64cf211 Brian Takita brian.takita@gmail.com http://github.com/btakita/pain-point/commit/1730d32c19b1f45e2d3675910e515cc979e6e691 1730d32c19b1f45e2d3675910e515cc979e6e691 2008-05-28T11:58:49-07:00 2008-05-28T11:58:49-07:00 Moving toward having the client side handle the login. f6dbada8aad048db97eb0f98e681fd1dc21c828b Brian Takita brian.takita@gmail.com