features/support/fixtures.rb @@ -1,3 +1,21 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: events +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# subtitle :string(255) +# description :text +# start :datetime +# stop :datetime +# descriptor :string(255) +# presenter :string(255) +# updated_at :datetime +# created_at :datetime +# + class Colloquium < Event def length app/models/colloquium.rb @@ -1,3 +1,21 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: events +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# subtitle :string(255) +# description :text +# start :datetime +# stop :datetime +# descriptor :string(255) +# presenter :string(255) +# updated_at :datetime +# created_at :datetime +# + class Conference < Event def length @@ -12,4 +30,4 @@ class Conference < Event "#{start.to_s(:conference)} thru #{stop.to_s(:conference)}" end -end \ No newline at end of file +end app/models/conference.rb @@ -1,3 +1,17 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: courses +# +# id :integer not null, primary key +# department :string(255) +# number :integer +# credits :integer +# title :string(255) +# description :text +# created_at :datetime +# + class Course < ActiveRecord::Base validates_presence_of :department, :number, :title, :credits app/models/course.rb @@ -1,3 +1,16 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: degrees +# +# id :integer not null, primary key +# user_id :integer +# degree_type :string(255) +# institution :string(255) +# url :string(255) +# year :integer +# + class Degree < ActiveRecord::Base validates_presence_of :user_id, :degree_type, :institution, :year app/models/degree.rb @@ -1,3 +1,21 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: events +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# subtitle :string(255) +# description :text +# start :datetime +# stop :datetime +# descriptor :string(255) +# presenter :string(255) +# updated_at :datetime +# created_at :datetime +# + class Event < ActiveRecord::Base validates_presence_of :title, :descriptor, :start, :stop app/models/event.rb @@ -1,3 +1,14 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: faqs +# +# id :integer not null, primary key +# title :string(255) +# identifier :string(255) +# updated_at :datetime +# + class Faq < ActiveRecord::Base has_many :questions, :order => :position, :dependent => :delete_all app/models/faq.rb @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: images +# +# id :integer not null, primary key +# url :string(255) +# caption :text(255) +# width :integer +# height :integer +# + class Image < ActiveRecord::Base has_many :image_tags, :dependent => :delete_all app/models/image.rb @@ -1,3 +1,13 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: image_tags +# +# id :integer not null, primary key +# image_id :integer +# tag :string(255) +# + class ImageTag < ActiveRecord::Base belongs_to :image app/models/image_tag.rb @@ -1,3 +1,19 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: newsitems +# +# id :integer not null, primary key +# headline :string(255) +# content :text +# user_id :integer +# created_at :datetime +# updated_at :datetime +# expires_at :datetime +# teaser :string(255) +# goes_live_at :datetime +# + class Newsitem < ActiveRecord::Base belongs_to :user app/models/newsitem.rb @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: pages +# +# id :integer not null, primary key +# identifier :string(255) +# content :text +# title :string(255) +# updated_at :datetime +# + class Page < ActiveRecord::Base validates_presence_of :title app/models/page.rb @@ -1,3 +1,16 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: questions +# +# id :integer not null, primary key +# query :text +# answer :text +# faq_id :integer +# position :integer +# updated_at :datetime +# + class Question < ActiveRecord::Base belongs_to :faq app/models/question.rb @@ -1,3 +1,26 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: users +# +# id :integer not null, primary key +# username :string(255) +# password_hash :string(255) +# role_id :integer +# email_address :string(255) +# last_name :string(255) +# first_name :string(255) +# office_phone :string(255) +# office_location :string(255) +# job_title :string(255) +# created_at :datetime +# updated_at :datetime +# salt :string(255) +# active :boolean +# remember_me_token :string(255) +# remember_me_token_expires_at :datetime +# + class User < ActiveRecord::Base acts_as_login_model :login_attribute => :username app/models/user.rb @@ -18,6 +18,10 @@ <td><%= form.text_field :subtitle %></td> </tr> <tr> + <td><%= form.label :presenter %></td> + <td><%= form.text_field :presenter %></td> + </tr> + <tr> <td>Description/abstract:</td> <td><%= form.text_area :description, :cols => 60, :rows => 10 %></td> </tr> app/views/events/_form.html.erb @@ -10,6 +10,7 @@ </h2> <p> + <span class="presenter"><%=h event.presenter %></span> <span class="when"><%= event.timing %></span> </p> </div> app/views/events/index.html.erb @@ -1,3 +1,7 @@ +# IMPORTANT: This file was generated by Cucumber 0.4.0 +# Edit at your own peril - it's recommended to regenerate this file +# in the future when you upgrade to a newer version of Cucumber. + config.cache_classes = true # This must be true for Cucumber to operate correctly! # Log error messages when you accidentally call methods on nil. @@ -15,7 +19,7 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'cucumber', :lib => false, :version => '>=0.3.104' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) +config.gem 'cucumber', :lib => false, :version => '>=0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) config.gem 'webrat', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) config.gem 'rspec', :lib => false, :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) config.gem 'rspec-rails', :lib => false, :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) config/environments/cucumber.rb @@ -21,5 +21,4 @@ config.action_mailer.delivery_method = :test config.gem "test-unit", :lib => "test/unit", :version => '~> 1.2' config.gem "rspec", :lib => false, :version => ">= 1.2.7" config.gem "rspec-rails", :lib => false, :version => ">= 1.2.7" -config.gem "cucumber", :lib => "cucumber", :version => "= 0.3.95" config.gem "webrat" config/environments/test.rb @@ -8,16 +8,20 @@ Feature: managing events When I go to the new event page Then I should be on the login page + @wip Scenario: add a colloquium Given I am logged in as an editor When I am on the new event page And I select "Colloquium" from "event[kind]" And I fill in "event[title]" with "Amazing Ruby Code" + And I fill in "event[subtitle]" with "Check It Out!" + And I fill in "event[presenter]" with "Charles M. Ruby" And I select tomorrow at "16:00" as the date and time And I fill in "event[length]" with "1.5" And I press "Create" Then I should be on the list of events - And I should see "Amazing Ruby Code" + And I should see "Amazing Ruby Code: Check It Out!" + And I should see "Charles M. Ruby" And I should see "4:00 PM" Scenario: add a conference features/event_management.feature @@ -1,3 +1,8 @@ +# IMPORTANT: This file was generated by Cucumber 0.4.0 +# Edit at your own peril - it's recommended to regenerate this file +# in the future when you upgrade to a newer version of Cucumber. +# Consider adding your own code to a new file instead of editing this one. + require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths")) # Commonly used webrat steps features/step_definitions/webrat_steps.rb @@ -1,37 +1,47 @@ +# IMPORTANT: This file was generated by Cucumber 0.4.0 +# Edit at your own peril - it's recommended to regenerate this file +# in the future when you upgrade to a newer version of Cucumber. +# Consider adding your own code to a new file instead of editing this one. + # Sets up the Rails environment for Cucumber ENV["RAILS_ENV"] ||= "cucumber" require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') require 'cucumber/rails/world' -# Whether or not to run each scenario within a database transaction. +# If you set this to true, each scenario will run in a database transaction. +# You can still turn off transactions on a per-scenario basis, simply tagging +# a feature or scenario with the @no-txn tag. +# +# If you set this to false, transactions will be off for all scenarios, +# regardless of whether you use @no-txn or not. # -# If you leave this to true, you can turn off traqnsactions on a -# per-scenario basis, simply tagging it with @no-txn +# Beware that turning transactions off will leave data in your database +# after each scenario, which can lead to hard-to-debug failures in +# subsequent scenarios. If you do this, we recommend you create a Before +# block that will explicitly put your database in a known state. Cucumber::Rails::World.use_transactional_fixtures = true -# Whether or not to allow Rails to rescue errors and render them on -# an error page. Default is false, which will cause an error to be -# raised. +# If you set this to false, any error raised from within your app will bubble +# up to your step definition and out to cucumber unless you catch it somewhere +# on the way. You can make Rails rescue errors and render error pages on a +# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag. # -# If you leave this to false, you can turn on Rails rescuing on a -# per-scenario basis, simply tagging it with @allow-rescue +# If you set this to true, Rails will rescue all errors and render error +# pages, more or less in the same way your application would behave in the +# default production environment. It's not recommended to do this for all +# of your scenarios, as this makes it hard to discover errors in your application. ActionController::Base.allow_rescue = false +require 'cucumber' # Comment out the next line if you don't want Cucumber Unicode support require 'cucumber/formatter/unicode' - -require 'webrat' require 'cucumber/webrat/element_locator' # Lets you do table.diff!(element_at('#my_table_or_dl_or_ul_or_ol').to_table) +require 'cucumber/rails/rspec' +require 'webrat' +require 'webrat/core/matchers' Webrat.configure do |config| config.mode = :rails config.open_error_files = false # Set to true if you want error pages to pop up in the browser end -require 'cucumber/rails/rspec' -require 'webrat/core/matchers' - -Fixtures.reset_cache -fixtures_folder = File.join(RAILS_ROOT, 'spec', 'fixtures') -fixtures = ['users', 'roles', 'privileges', 'privileges_roles'] -Fixtures.create_fixtures(fixtures_folder, fixtures) features/support/env.rb @@ -1,16 +1,24 @@ +# This file was generated by $LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib') unless ARGV.any? {|a| a =~ /^gems/} begin require 'cucumber/rake/task' + + # Use vendored cucumber binary if possible. If it's not vendored, + # Cucumber::Rake::Task will automatically use installed gem's cucumber binary + vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first + namespace :cucumber do Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t| + t.binary = vendored_cucumber_binary t.fork = true # You may get faster startup if you set this to false t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" end Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t| + t.binary = vendored_cucumber_binary t.fork = true # You may get faster startup if you set this to false t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" end @@ -33,4 +41,4 @@ rescue LoadError end end -end \ No newline at end of file +end lib/tasks/cucumber.rake @@ -1,9 +1,17 @@ #!/usr/bin/env ruby -begin - load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber") -rescue LoadError => e - raise unless e.to_s =~ /cucumber/ - require 'rubygems' + +vendored_cucumber_binary = Dir[File.join(File.dirname(__FILE__), + '..', + 'vendor', + '{gems,plugins}', + 'cucumber*', + 'bin', + 'cucumber')].first + +if vendored_cucumber_binary + load File.expand_path(vendored_cucumber_binary) +else + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'cucumber' load Cucumber::BINARY -end \ No newline at end of file +end script/cucumber @@ -1,3 +1,17 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: courses +# +# id :integer not null, primary key +# department :string(255) +# number :integer +# credits :integer +# title :string(255) +# description :text +# created_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html cs108: id: 3 spec/fixtures/courses.yml @@ -1,3 +1,16 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: degrees +# +# id :integer not null, primary key +# user_id :integer +# degree_type :string(255) +# institution :string(255) +# url :string(255) +# year :integer +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html jeremy_calvin: id: 1 spec/fixtures/degrees.yml @@ -1,3 +1,21 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: events +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# subtitle :string(255) +# description :text +# start :datetime +# stop :datetime +# descriptor :string(255) +# presenter :string(255) +# updated_at :datetime +# created_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html old_colloquium: id: 1 spec/fixtures/events.yml @@ -1,3 +1,14 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: faqs +# +# id :integer not null, primary key +# title :string(255) +# identifier :string(255) +# updated_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html empty_faq: id: 1 @@ -9,4 +20,4 @@ student_faq: title: FAQ for Students identifier: student updated_at: <%= 1.day.ago.to_s(:db) %> - \ No newline at end of file + spec/fixtures/faqs.yml @@ -1,3 +1,13 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: image_tags +# +# id :integer not null, primary key +# image_id :integer +# tag :string(255) +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html for_mission: id: 1 @@ -30,4 +40,4 @@ for_jeremy: for_sharon_headshot: id: 8 image_id: 7 - tag: sharon_headshot \ No newline at end of file + tag: sharon_headshot spec/fixtures/image_tags.yml @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: images +# +# id :integer not null, primary key +# url :string(255) +# caption :text(255) +# width :integer +# height :integer +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html mission_wide: id: 1 @@ -38,4 +50,4 @@ sharon_headshot: url: /sharon.png width: 150 height: 200 - \ No newline at end of file + spec/fixtures/images.yml @@ -1,3 +1,19 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: newsitems +# +# id :integer not null, primary key +# headline :string(255) +# content :text +# user_id :integer +# created_at :datetime +# updated_at :datetime +# expires_at :datetime +# teaser :string(255) +# goes_live_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html another_todays_news: id: 5 spec/fixtures/newsitems.yml @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: pages +# +# id :integer not null, primary key +# identifier :string(255) +# content :text +# title :string(255) +# updated_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html mission: id: 1 spec/fixtures/pages.yml @@ -1,3 +1,16 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: questions +# +# id :integer not null, primary key +# query :text +# answer :text +# faq_id :integer +# position :integer +# updated_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html student2: id: 1 @@ -13,4 +26,4 @@ student1: query: First query? answer: First answer. updated_at: <%= 11.days.ago.to_s(:db) %> - \ No newline at end of file + spec/fixtures/questions.yml @@ -1,3 +1,26 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: users +# +# id :integer not null, primary key +# username :string(255) +# password_hash :string(255) +# role_id :integer +# email_address :string(255) +# last_name :string(255) +# first_name :string(255) +# office_phone :string(255) +# office_location :string(255) +# job_title :string(255) +# created_at :datetime +# updated_at :datetime +# salt :string(255) +# active :boolean +# remember_me_token :string(255) +# remember_me_token_expires_at :datetime +# + # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html calvin: id: 1 spec/fixtures/users.yml @@ -1,3 +1,17 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: courses +# +# id :integer not null, primary key +# department :string(255) +# number :integer +# credits :integer +# title :string(255) +# description :text +# created_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Course do spec/models/course_spec.rb @@ -1,3 +1,16 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: degrees +# +# id :integer not null, primary key +# user_id :integer +# degree_type :string(255) +# institution :string(255) +# url :string(255) +# year :integer +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') class DegreeTest < ActiveRecord::TestCase spec/models/degree_spec.rb @@ -1,3 +1,21 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: events +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# subtitle :string(255) +# description :text +# start :datetime +# stop :datetime +# descriptor :string(255) +# presenter :string(255) +# updated_at :datetime +# created_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Event do spec/models/event_spec.rb @@ -1,3 +1,14 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: faqs +# +# id :integer not null, primary key +# title :string(255) +# identifier :string(255) +# updated_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Faq do spec/models/faq_spec.rb @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: images +# +# id :integer not null, primary key +# url :string(255) +# caption :text(255) +# width :integer +# height :integer +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') class ImageTest < ActiveRecord::TestCase spec/models/image_spec.rb @@ -1,3 +1,13 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: image_tags +# +# id :integer not null, primary key +# image_id :integer +# tag :string(255) +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') class ImageTagTest < ActiveRecord::TestCase spec/models/image_tag_spec.rb @@ -1,3 +1,19 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: newsitems +# +# id :integer not null, primary key +# headline :string(255) +# content :text +# user_id :integer +# created_at :datetime +# updated_at :datetime +# expires_at :datetime +# teaser :string(255) +# goes_live_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Newsitem do spec/models/newsitem_spec.rb @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: pages +# +# id :integer not null, primary key +# identifier :string(255) +# content :text +# title :string(255) +# updated_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Page do spec/models/page_spec.rb @@ -1,3 +1,16 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: questions +# +# id :integer not null, primary key +# query :text +# answer :text +# faq_id :integer +# position :integer +# updated_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Question do spec/models/question_spec.rb @@ -1,3 +1,26 @@ +# == Schema Information +# Schema version: 20090905181738 +# +# Table name: users +# +# id :integer not null, primary key +# username :string(255) +# password_hash :string(255) +# role_id :integer +# email_address :string(255) +# last_name :string(255) +# first_name :string(255) +# office_phone :string(255) +# office_location :string(255) +# job_title :string(255) +# created_at :datetime +# updated_at :datetime +# salt :string(255) +# active :boolean +# remember_me_token :string(255) +# remember_me_token_expires_at :datetime +# + require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe User do spec/models/user_spec.rb @@ -4,7 +4,9 @@ describe "/events/_form.html.erb" do it "should view a form for a new event" do event = mock_model(Event, :new_record? => true, :kind => "Conference", :title => "the title", - :subtitle => "the subtitle", :description => "description!", + :subtitle => "the subtitle", + :presenter => 'the presenter', + :description => "description!", :start => Time.now, :length => 1) assigns[:event] = event @@ -18,6 +20,7 @@ describe "/events/_form.html.erb" do end form.inner_html.should have_selector "input#event_title" form.inner_html.should have_selector "input#event_subtitle" + form.inner_html.should have_selector "input#event_presenter" form.inner_html.should have_selector "textarea#event_description" form.inner_html.should have_selector "input#event_length" form.inner_html.should have_selector "input[type=submit]" @@ -26,7 +29,8 @@ describe "/events/_form.html.erb" do it "should view a form to edit an event" do event = mock_model(Event, :new_record? => false, :kind => "Conference", :title => "the title", - :subtitle => "the subtitle", :description => "description!", + :subtitle => "the subtitle", :presenter => "presenter", + :description => "description!", :start => Time.now, :length => 1) assigns[:event] = event spec/views/events/_form.html.erb_spec.rb @@ -5,7 +5,7 @@ describe "/events/index.html.erb" do describe "rendering an event" do before(:each) do timing = mock("timing", :to_s => "the timing") - @event = mock_model(Event, :timing => timing) + @event = mock_model(Event, :timing => timing, :presenter => "Charles M. Ruby") assigns[:events] = [@event] assigns[:title] = "The Title" template.should_receive(:format_titles).with(@event).and_return("the titles!") @@ -24,6 +24,10 @@ describe "/events/index.html.erb" do end end + it "should have a presenter" do + response.should have_selector(".presenter", :content => "Charles M. Ruby") + end + it "should have a time" do assert_select "div#event-#{@event.id}" do assert_select ".when", "the timing" spec/views/events/index.html.erb_spec.rb 52f5c76beab3d9e783e543b00763be05ff493719 Jeremy D. Frens jdfrens@gmail.com http://github.com/jdfrens/calvincs/commit/5b5f6916ebf377239a5fc01c2f6f394a980d1e7e 5b5f6916ebf377239a5fc01c2f6f394a980d1e7e 2009-10-11T18:14:37-07:00 2009-10-11T18:14:37-07:00 Updated for latest version of gems. Add annotate_models plugin. Working on events. 3bbf99ff29dafc70cec4dd93b041b46fd5267245 Jeremy D. Frens jdfrens@gmail.com