features/step_definitions/list_steps.rb features/step_definitions/person_steps.rb features/step_definitions/session_steps.rb features/step_definitions/task_steps.rb features/step_definitions/team_steps.rb features/task_filtering.feature @@ -5,7 +5,7 @@ class AdminController < ApplicationController def login case request.method when :post - if session[:person] = Person.authenticate(params[:person_login], params[:person_password]) + if session[:person] = Person.authenticate(params[:person][:login], params[:person][:password]) # Load up their preferences too session[:preference] = Preference.find(:first, :conditions => ["person_id = ?", session[:person].id ]) app/controllers/admin_controller.rb @@ -5,10 +5,8 @@ module TasksHelper ["Only my tasks".t, "Only my tasks"], ["Only today's tasks".t, "Only today's tasks"], ] - person.teams.each do |team| - team.memberships.each do |membership| - display_list << ["Only " + team.name + ": " + membership.person.name, membership.person.id.to_s] - end + person.fellow_team_members.each do |person| + display_list << ["Only #{person.name}'s tasks", person.id] end display_list end app/helpers/tasks_helper.rb @@ -3,4 +3,6 @@ class Membership < ActiveRecord::Base belongs_to(:person) # people can be members ... belongs_to(:team) # ... of teams + named_scope :confirmed, :conditions => {:confirmed => true} + end app/models/membership.rb @@ -278,8 +278,13 @@ http://www.mychores.co.uk" end + def confirmed_teams + Team.find(memberships.confirmed.map(&:team_id)) + end - + def fellow_team_members + confirmed_teams.map(&:confirmed_members).flatten.uniq - [self] + end app/models/person.rb @@ -23,6 +23,11 @@ class Task < ActiveRecord::Base def short_name truncate(name) end + + def list_name + return '' if list.nil? + list.name + end def describe_recurrence app/models/task.rb @@ -12,6 +12,9 @@ validates_presence_of(:name) validates_length_of(:name, :maximum=>25) + def confirmed_members + Person.find(memberships.confirmed.map(&:person_id)) + end protected app/models/team.rb @@ -12,25 +12,25 @@ <% @links += [{:url => "/home/privacy", :title => "Privacy", :accesskey => "p"}] %> -<% form_tag(:action=> "login") do %><div> +<% form_for(:person, :url => {:action => :login}) do |f| -%><div> <table> <tr> - <th>Login id:</th> - <td><input type="text" name="person_login" id="person_login" class='styled' /></td> + <th><%= f.label(:login, 'Login ID') %>:</th> + <td><%= f.text_field(:login, :class => 'styled') %></td> </tr> <tr> - <th>Password:</th> - <td><input type="password" name="person_password" id="person_password" class='styled' /></td> + <th><%= f.label(:password) %>:</th> + <td><%= f.password_field(:password, :class => 'styled') %></td> </tr> </table> <br /> - <input type="submit" name="login" value="Login" /> + <p><%= f.submit('Login') %></p> -</div><% end %> +</div><% end -%> <br /> @@ -42,4 +42,4 @@ <h3><img src='/images/openid-icon.png' width='16' height='15' alt='OpenID' /> Login using OpenID</h3> <p>If your account is associated with an OpenID you may use it to login.</p> -<p><a class='action' href='/openid/login'>Login using OpenID</a></p> \ No newline at end of file +<p><a class='action' href='/openid/login'>Login using OpenID</a></p> app/views/admin/login.rhtml @@ -1,12 +1,3 @@ -Given /^I am not logged in$/ do - visits '/admin/logout' -end - -Given /^a person called '(\w+)' with login ID '(\w+)'$/ do |name, login| - Person.create!(:name => name, :login => login, :email => "#{name}@test.com", - :password => '12345', :password_confirmation => '12345') -end - Then /^the referrer ID for '(\w+)' should be set to '(\w+)'$/ do |login, referrer| person = Person.find_by_login(login) person.parent.should == Person.find_by_login(referrer) features/step_definitions/new_user_registration_steps.rb @@ -15,3 +15,14 @@ Then /^the text field with id '(\w+)' should be filled in with '(.+)'$/ do |fiel response.should have_tag('input[id=?][value=?]', field_id, value) end + + + + + + + +When /^I debug the page$/ do + raise response.body +end + features/step_definitions/viewing_steps.rb @@ -25,4 +25,71 @@ describe Person do end end + + describe "confirmed_teams" do + before(:each) do + @team1 = mock_model(Team) + Team.stub!(:find).and_return(@team1) + @mem1 = mock_model(Membership, :team_id => 1, :confirmed => true) + @mem2 = mock_model(Membership, :team_id => 2) + @memberships = [@mem1, @mem2] + @confirmed_memberships = [@mem1] + @person = Person.new(:memberships => @memberships) + @person.stub!(:memberships).and_return(@memberships) + @memberships.stub!(:confirmed).and_return(@confirmed_memberships) + end + + it "should find the memberships" do + @person.should_receive(:memberships).and_return(@memberships) + @memberships.should_receive(:confirmed).and_return(@confirmed_memberships) + @person.confirmed_teams + end + + it "should look up the teams by memberships" do + Team.should_receive(:find).with([1]).and_return([@team1]) + @person.confirmed_teams.should == [@team1] + end + + it "should find more than one team" do + team3 = mock_model(Team) + mem3 = mock_model(Membership, :team_id => 3, :confirmed => true) + @memberships.stub!(:confirmed).and_return([@mem1, mem3]) + Team.should_receive(:find).with([1, 3]).and_return([@team1, team3]) + @person.confirmed_teams.should == [@team1, team3] + end + end + + describe "fellow_team_members" do + before(:each) do + @person = Person.new + end + + it "should ask for the confirmed teams" do + @person.should_receive(:confirmed_teams).and_return([]) + @person.fellow_team_members + end + + it "should look up the confirmed members of all teams, minus yourself" do + team1 = mock_model(Team) + team2 = mock_model(Team) + person2 = mock_model(Person) + person3 = mock_model(Person) + @person.stub!(:confirmed_teams).and_return([team1, team2]) + team1.should_receive(:confirmed_members).and_return([@person, person2]) + team2.should_receive(:confirmed_members).and_return([@person, person3]) + @person.fellow_team_members.should == [person2, person3] + end + + it "should not break if a person belongs to no teams" do + @person.stub!(:confirmed_teams).and_return([]) + @person.fellow_team_members.should == [] + end + + it "should not break if a team contains no members" do + team1 = mock_model(Team) + @person.stub!(:confirmed_teams).and_return([team1]) + team1.stub!(:confirmed_members).and_return([]) + @person.fellow_team_members.should == [] + end + end end spec/models/person_spec.rb @@ -55,6 +55,18 @@ describe Task do end end + describe "list_name" do + it "should return empty string if there is no list" do + task = Task.new + task.list_name.should == '' + end + + it "should return the name of the list if there is one" do + task = Task.new(:list => mock_model(List, :name => 'Bedroom')) + task.list_name.should == 'Bedroom' + end + end + describe "describe_recurrence" do it "should describe a one off task" do task = Task.new(:one_off => true) @@ -150,4 +162,4 @@ describe Task do end end -end \ No newline at end of file +end spec/models/task_spec.rb 7fb5516dddb2c80b83ff6139dabf5ef6efb88a5e sermoa aimee@mychores.co.uk http://github.com/sermoa/mychores/commit/69486af837c52f434a0f038092ae9626b0bf41f8 69486af837c52f434a0f038092ae9626b0bf41f8 2009-01-10T06:20:40-08:00 2009-01-10T06:20:40-08:00 Verified the first story for task filtering by person. 9e9a4a53f00aaf73baf4a81dc4056f72bc4ce61b sermoa aimee@mychores.co.uk