spec/controller_macros.rb spec/controllers/hazmat_classes_controller_spec.rb spec/models/student_spec.rb spec/support/authlogic/macros.rb @@ -4,4 +4,6 @@ db/schema.rb log/*.log config/database.yml config/env_hook.rb +spec/*.txt +spec/*.html tmp \ No newline at end of file .gitignore @@ -1,4 +1,6 @@ class HazmatClass < ActiveRecord::Base + default_scope :order => 'start_date DESC, end_date DESC' + has_many :enrollments has_many :students, :through => :enrollments accepts_nested_attributes_for :students, :reject_if => lambda { |a| a.values.all?(&:blank?) }, :allow_destroy => true @@ -8,8 +10,8 @@ class HazmatClass < ActiveRecord::Base validates_date :end_date def dates - start_format_string = '%b %d' << (end_date.year != start_date.year ? ', %Y' : '') - end_format_string = (start_date.month != end_date.month ? '%b ' : '') << (start_date.day != end_date.day ? '%d' : '') << ', %Y' + start_format_string = '%b ' << start_date.day.to_i.to_s << (end_date.year != start_date.year ? ', %Y' : '') + end_format_string = (start_date.month != end_date.month ? '%b ' : '') << (start_date.day != end_date.day ? end_date.day.to_i.to_s : '') << ', %Y' "#{ start_date.strftime(start_format_string) }#{ start_date != end_date ? '-' : '' }#{ end_date.strftime(end_format_string) }" end end app/models/hazmat_class.rb @@ -1,5 +1,4 @@ ActionController::Routing::Routes.draw do |map| - map.logout 'logout', :controller => 'user_sessions', :action => 'destroy' map.login 'login', :controller => 'user_sessions', :action => 'new' map.resources :user_sessions config/routes.rb @@ -17,4 +17,11 @@ end # Factory.define :enrollment do |f| # f.student { |c| c.association(:student) } # f.hazmat_class { |c| c.association(:hazmat_class) } -# end \ No newline at end of file +# end + +Factory.define :user do |f| + f.sequence(:username) { |n| "Ulga the User #{n}" } + f.password "secret" + f.password_confirmation "secret" + f.email "ulga@example.com" +end \ No newline at end of file spec/factories.rb @@ -14,11 +14,11 @@ describe HazmatClass do end it "should not be valid when start date is after end date" do - Factory.build(:start_date => '2009-10-22', :end_date => '2009-10-21').should_not be_valid + Factory.build(:hazmat_class, :start_date => '2009-10-22', :end_date => '2009-10-21').should_not be_valid end it "should display just one date for 1-day classes" do - company = Factory.create(:start_date => '2009-10-22', :end_date => '2009-10-22') + company = Factory.create(:hazmat_class, :start_date => '2009-10-22', :end_date => '2009-10-22') company.dates.should == 'Oct 22, 2009' end @@ -29,12 +29,12 @@ describe HazmatClass do it "should display a range of dates for 2-day classes spanning months" do company = Factory.create(:hazmat_class, :start_date => '2009-10-31', :end_date => '2009-11-01') - company.dates.should == 'Oct 31-Nov 01, 2009' + company.dates.should == 'Oct 31-Nov 1, 2009' end it "should display a range of dates for 2-day classes spanning years" do company = Factory.create(:hazmat_class, :start_date => '2009-12-31', :end_date => '2010-01-01') - company.dates.should == 'Dec 31, 2009-Jan 01, 2010' + company.dates.should == 'Dec 31, 2009-Jan 1, 2010' end it "should accept nested attributes for students" do spec/models/hazmat_class_spec.rb @@ -1,4 +1,7 @@ --colour ---format progress +--format nested +--format specdoc:spec/spec_full_report.txt +--format failing_examples:spec/spec_failing_examples.txt +--format html:spec/spec_report.html --loadby mtime ---reverse +--reverse \ No newline at end of file spec/spec.opts @@ -4,6 +4,7 @@ gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 require 'spec/autorun' require 'spec/rails' require File.expand_path(File.join(File.dirname(__FILE__),'factories')) +require File.expand_path(File.join(File.dirname(__FILE__),'controller_macros')) Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f} @@ -11,4 +12,6 @@ Spec::Runner.configure do |config| config.use_transactional_fixtures = true config.use_instantiated_fixtures = false config.fixture_path = RAILS_ROOT + '/spec/fixtures/' + + config.include(ControllerMacros, :type => :controller) end spec/spec_helper.rb de515bc7a5b666039f5b88369e77ce5651ec21cb Tim Gossett tim@mrgossett.com http://github.com/MrGossett/class-roster/commit/84667a2b77ee9bf926c727d96e6d52d5399d931d 84667a2b77ee9bf926c727d96e6d52d5399d931d 2009-10-26T11:12:37-07:00 2009-10-26T11:12:37-07:00 refactored HazmatClass#dates; all specs pass bea0757f67197c2daa74503a2b53730292aebf9f Tim Gossett tim@mrgossett.com