script/spec script/spec_server spec/rcov.opts spec/spec.opts spec/spec_helper.rb stories/all.rb stories/helper.rb @@ -1,2 +1,17 @@ +# == Schema Information +# Schema version: 20080622042242 +# +# Table name: statuses +# +# id :integer(11) not null, primary key +# message :text +# user_id :integer(11) +# created_at :datetime +# updated_at :datetime +# + class Status < ActiveRecord::Base + belongs_to :user + + end app/models/status.rb @@ -1,6 +1,33 @@ +# == Schema Information +# Schema version: 20080622042242 +# +# Table name: users +# +# id :integer(11) not null, primary key +# login :string(40) +# name :string(100) default("") +# email :string(100) +# crypted_password :string(40) +# salt :string(40) +# created_at :datetime +# updated_at :datetime +# remember_token :string(40) +# remember_token_expires_at :datetime +# activation_code :string(40) +# activated_at :datetime +# state :string(255) default("passive") +# deleted_at :datetime +# + require 'digest/sha1' class User < ActiveRecord::Base + + has_many :statuses, :dependent => :nullify + has_one :current_status, :class_name => "Status", :order => "created_at", :dependent => :nullify + +# Restful Authentication + include Authentication include Authentication::ByPassword include Authentication::ByCookieToken app/models/user.rb @@ -58,34 +58,6 @@ describe UsersController do end.should_not change(User, :count) end - - it 'activates user' do - User.authenticate('aaron', 'monkey').should be_nil - get :activate, :activation_code => users(:aaron).activation_code - response.should redirect_to('/login') - flash[:notice].should_not be_nil - flash[:error ].should be_nil - User.authenticate('aaron', 'monkey').should == users(:aaron) - end - - it 'does not activate user without key' do - get :activate - flash[:notice].should be_nil - flash[:error ].should_not be_nil - end - - it 'does not activate user with blank key' do - get :activate, :activation_code => '' - flash[:notice].should be_nil - flash[:error ].should_not be_nil - end - - it 'does not activate user with bogus key' do - get :activate, :activation_code => 'i_haxxor_joo' - flash[:notice].should be_nil - flash[:error ].should_not be_nil - end - def create_user(options = {}) post :create, :user => { :login => 'quire', :email => 'quire@example.com', :password => 'quire69', :password_confirmation => 'quire69' }.merge(options) spec/controllers/users_controller_spec.rb @@ -1,9 +1,25 @@ +# == Schema Information +# Schema version: 20080622042242 +# +# Table name: statuses +# +# id :integer(11) not null, primary key +# message :text +# user_id :integer(11) +# created_at :datetime +# updated_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -one: - message: MyText +specing_foo: + message: Specing foo + user_id: 1 + +playing_with_jquery: + message: Playing with jQuery user_id: 1 -two: - message: MyText +designing_ui_for_holler: + message: Designing the UI for holler user_id: 1 spec/fixtures/statuses.yml @@ -1,3 +1,24 @@ +# == Schema Information +# Schema version: 20080622042242 +# +# Table name: users +# +# id :integer(11) not null, primary key +# login :string(40) +# name :string(100) default("") +# email :string(100) +# crypted_password :string(40) +# salt :string(40) +# created_at :datetime +# updated_at :datetime +# remember_token :string(40) +# remember_token_expires_at :datetime +# activation_code :string(40) +# activated_at :datetime +# state :string(255) default("passive") +# deleted_at :datetime +# + quentin: id: 1 spec/fixtures/users.yml 79c6d168f4f7267ebc1874f665476a154c061f8f Zach Inglis zach@lt3media.com http://github.com/zachinglis/holler/commit/19051cafc002745fdd515d76f1cdcada5fb85272 19051cafc002745fdd515d76f1cdcada5fb85272 2008-06-21T21:32:44-07:00 2008-06-21T21:32:44-07:00 Fixing up associations and spec issues d9bea26d7c3df4520e588161acb6a0b4993291cc Zach Inglis zach@lt3media.com