@@ -1,6 +1,10 @@ == Change Log === Edge + +* Update Cucumber and RSpec, clean up some features and fix specs. [Sean Cribbs] +* Set the protected attributes for users in User.protected_attributes +[Jim Gay] * Don't allow a nil ETag in SiteController. [David Cato] * Prevent failed login message from sticking around. [Kunal Shah] * Fix failing test regarding extension order. [Brett McHargue] CHANGELOG @@ -37,7 +37,7 @@ class Admin::PreferencesController < ApplicationController def valid_params? hash = (params[:user] || {}).symbolize_keys - (hash.keys - [:password, :password_confirmation, :email]).size == 0 + (hash.keys - User.protected_attributes).size == 0 end def announce_bad_data app/controllers/admin/preferences_controller.rb @@ -37,7 +37,7 @@ class Admin::WelcomeController < ApplicationController end def announce_invalid_user - flash[:error].now = 'Invalid username or password.' + flash.now[:error] = 'Invalid username or password.' end end app/controllers/admin/welcome_controller.rb @@ -27,6 +27,15 @@ class User < ActiveRecord::Base validates_numericality_of :id, :only_integer => true, :allow_nil => true, :message => 'must be a number' attr_writer :confirm_password + class << self + def protected_attributes + @protected_attributes ||= [:password, :password_confirmation, :email] + end + + def protected_attributes=(array) + @protected_attributes = array.map{|att| att.to_sym } + end + end def sha1(phrase) Digest::SHA1.hexdigest("--#{salt}--#{phrase}--") app/models/user.rb @@ -7,10 +7,12 @@ development: adapter: sqlite3 database: db/radiant_dev.db -test: +test: &TEST adapter: sqlite3 database: db/radiant_test.db production: adapter: sqlite3 - database: db/radiant_live.db \ No newline at end of file + database: db/radiant_live.db +cucumber: + <<: *TEST \ No newline at end of file config/database.sqlite.yml @@ -30,7 +30,7 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem "rspec", :version => "1.2.4", :lib => false -config.gem "rspec-rails", :version => "1.2.4", :lib => false +config.gem "rspec", :version => "1.2.6", :lib => false +config.gem "rspec-rails", :version => "1.2.6", :lib => false config.gem "webrat", :version => "~>0.4.4", :lib => false -config.gem "cucumber", :version => "~>0.3.0", :lib => false \ No newline at end of file +config.gem "cucumber", :version => "~>0.3.9", :lib => false \ No newline at end of file config/environments/test.rb @@ -4,21 +4,21 @@ Feature: Proper content negotiation wants to access the admin section with multiple content formats Scenario: Default to HTML format - Given I am logged in as 'admin' - When I send an 'Accept' header of 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-ms-application, application/vnd.ms-xpsdocument, application/xaml+xml, application/x-ms-xbap, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' - And I go to '/admin/pages' - Then I should not see 'Missing template' + Given I am logged in as "admin" + When I send an "Accept" header of "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-ms-application, application/vnd.ms-xpsdocument, application/xaml+xml, application/x-ms-xbap, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*" + And I go to "/admin/pages" + Then I should not see "Missing template" Scenario: Requesting XML format via file-extension - Given I am logged in as 'admin' - When I send an 'Accept' header of 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-ms-application, application/vnd.ms-xpsdocument, application/xaml+xml, application/x-ms-xbap, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' - And I go to '/admin/pages.xml' - Then I should see '<\?xml' + Given I am logged in as "admin" + When I send an "Accept" header of "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-ms-application, application/vnd.ms-xpsdocument, application/xaml+xml, application/x-ms-xbap, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*" + And I go to "/admin/pages.xml" + Then I should see "<\?xml" Scenario: Requesting children via Ajax - Given I am logged in as 'admin' - When I send an 'Accept' header of 'text/javascript, text/html, application/xml, text/xml, */*' - And I send an 'X-Requested-With' header of 'XMLHttpRequest' - And I request the children of page 'home' - Then I should not see 'Radiant CMS' - And I should see '<tr' \ No newline at end of file + Given I am logged in as "admin" + When I send an "Accept" header of "text/javascript, text/html, application/xml, text/xml, */*" + And I send an "X-Requested-With" header of "XMLHttpRequest" + And I request the children of page "home" + Then I should not see "Radiant CMS" + And I should see "<tr" \ No newline at end of file features/admin/content_negotiation.feature @@ -3,8 +3,8 @@ Feature: Managing snippets As a developer I want to manage the layouts Background: - Given I am logged in as 'developer' + Given I am logged in as "developer" Scenario: View a layout When I view a layout - Then I should see 'Edit Layout' \ No newline at end of file + Then I should see "Edit Layout" \ No newline at end of file features/admin/layouts_management.feature @@ -4,68 +4,68 @@ Feature: Managing pages wants to manipulate pages in the admin interface Background: - Given I am logged in as 'existing' + Given I am logged in as "existing" Scenario: Listing pages - When I go to '/admin/pages' - Then I should see 'Pages' - And I should see 'Home' + When I go to "/admin/pages" + Then I should see "Pages" + And I should see "Home" Scenario: No pages Given there are no pages - When I go to '/admin/pages' - Then I should see 'No Pages' + When I go to "/admin/pages" + Then I should see "No Pages" Scenario: Creating a homepage Given there are no pages - When I go to '/admin/pages' - And I follow 'New Homepage' - Then I should see 'New Page' - And there should be a 'body' part - And there should be an 'extended' part - When I fill in 'Page Title' with 'My site' - And I fill in 'Slug' with '/' - And I fill in 'Breadcrumb' with 'My site' - And I fill in the 'body' content with 'Under Construction' - And I fill in the 'extended' content with 'foobar' - And I select 'Published' from 'Status' - And I press 'Create page' - Then I should see 'Your page has been saved' - When I go to '/' - Then I should see 'Under Construction' + When I go to "/admin/pages" + And I follow "New Homepage" + Then I should see "New Page" + And there should be a "body" part + And there should be an "extended" part + When I fill in "Page Title" with "My site" + And I fill in "Slug" with "/" + And I fill in "Breadcrumb" with "My site" + And I fill in the "body" content with "Under Construction" + And I fill in the "extended" content with "foobar" + And I select "Published" from "Status" + And I press "Create page" + Then I should see "Your page has been saved" + When I go to "/" + Then I should see "Under Construction" Scenario: Creating child pages - When I go to '/admin/pages' - And I follow 'Add child' - Then I should see 'New Page' - And there should be a 'body' part - And there should be an 'extended' part - When I fill in 'Page Title' with 'My child' - And I fill in 'Slug' with 'my-child' - And I fill in 'Breadcrumb' with 'My child' - And I fill in the 'body' content with 'Under Construction' - And I fill in the 'extended' content with 'foobar' - And I select 'Published' from 'Status' - And I press 'Save and Continue Editing' - Then I should see 'Your page has been saved' - And I should see 'Under Construction' - When I go to '/my-child' - Then I should see 'Under Construction' + When I go to "/admin/pages" + And I follow "Add child" + Then I should see "New Page" + And there should be a "body" part + And there should be an "extended" part + When I fill in "Page Title" with "My child" + And I fill in "Slug" with "my-child" + And I fill in "Breadcrumb" with "My child" + And I fill in the "body" content with "Under Construction" + And I fill in the "extended" content with "foobar" + And I select "Published" from "Status" + And I press "Save and Continue Editing" + Then I should see "Your page has been saved" + And I should see "Under Construction" + When I go to "/my-child" + Then I should see "Under Construction" Scenario: Delete page - When I go to '/admin/pages' - And I follow 'remove page' - Then I should see 'permanently remove' - When I press 'Delete Pages' - Then I should see 'successfully removed' + When I go to "/admin/pages" + And I follow "remove page" + Then I should see "permanently remove" + When I press "Delete Pages" + Then I should see "successfully removed" Scenario: View a page When I view a page - Then I should see 'Edit Page' + Then I should see "Edit Page" Scenario: Change page type - When I edit the 'virtual' page - And I select '&lt;normal&gt;' from 'Page type' - And I press 'Save and Continue Editing' - Then I should see 'Your page has been saved' - And '&lt;normal&gt;' should be selected for 'Page type' \ No newline at end of file + When I edit the "virtual" page + And I select "&lt;normal&gt;" from "Page type" + And I press "Save and Continue Editing" + Then I should see "Your page has been saved" + And "&lt;normal&gt;" should be selected for "Page type" \ No newline at end of file features/admin/pages_management.feature @@ -4,18 +4,18 @@ Feature: Managing snippets content, as a content editor I want to manage a collection of snippets Background: - Given I am logged in as 'existing' + Given I am logged in as "existing" Scenario: List snippets - When I follow 'Snippets' - Then I should see 'first' - And I should see 'another' - And I should see 'markdown' + When I follow "Snippets" + Then I should see "first" + And I should see "another" + And I should see "markdown" # And a host of others Scenario: Create a snippet - When I follow 'Snippets' - And I follow 'New Snippet' + When I follow "Snippets" + And I follow "New Snippet" And I fill in "Name" with "Mine" And I fill in "Body" with "My snippet" And I press "Create Snippet" @@ -23,16 +23,16 @@ Feature: Managing snippets And I should see "Mine" Scenario: Display form errors - When I follow 'Snippets' - And I follow 'New Snippet' + When I follow "Snippets" + And I follow "New Snippet" And I fill in "Body" with "My snippet" And I press "Create Snippet" Then I should see an error message And I should see the form Scenario: Continue editing - When I follow 'Snippets' - And I follow 'New Snippet' + When I follow "Snippets" + And I follow "New Snippet" And I fill in "Name" with "Mine" And I fill in "Body" with "My snippet" And I press "Save and Continue Editing" @@ -41,14 +41,14 @@ Feature: Managing snippets Scenario: View a snippet When I view a snippet - Then I should see 'Edit Snippet' + Then I should see "Edit Snippet" Scenario: Delete a snippet with confirmation - When I follow 'Snippets' - And I follow 'Remove' - Then I should see 'permanently remove' - And I should see 'another' - When I press 'Delete Snippet' - Then I should see 'has been deleted' - And I should see 'first' + When I follow "Snippets" + And I follow "Remove" + Then I should see "permanently remove" + And I should see "another" + When I press "Delete Snippet" + Then I should see "has been deleted" + And I should see "first" \ No newline at end of file features/admin/snippets_management.feature @@ -4,7 +4,7 @@ Feature: User authentication and permissions users should be given different access permissions Scenario Outline: Authentication-login - When I go to '/admin/login' + When I go to "/admin/login" And I fill in "Username" with "<username>" And I fill in "Password" with "password" And I press "Login" @@ -17,9 +17,9 @@ Feature: User authentication and permissions | developer | Scenario Outline: Authentication-logout - Given I am logged in as '<username>' - When I follow 'Log out' - Then I should see 'You are now logged out.' + Given I am logged in as "<username>" + When I follow "Log out" + Then I should see "You are now logged out." Examples: | username | @@ -29,9 +29,9 @@ Feature: User authentication and permissions Scenario Outline: All users can edit pages - Given I am logged in as '<username>' - And I should see 'Pages' - When I go to '/admin/pages' + Given I am logged in as "<username>" + And I should see "Pages" + When I go to "/admin/pages" And I follow "Home" Then I should see "Edit Page" And I should see "Pages" @@ -43,12 +43,12 @@ Feature: User authentication and permissions | developer | Scenario Outline: All users can see and edit snippets - Given I am logged in as '<username>' - And I should see 'Snippets' - When I go to '/admin/snippets' - And I should not see 'You must have developer privileges' - And I follow 'first' - Then I should see 'Edit Snippet' + Given I am logged in as "<username>" + And I should see "Snippets" + When I go to "/admin/snippets" + And I should not see "You must have developer privileges" + And I follow "first" + Then I should see "Edit Snippet" Examples: | username | @@ -57,12 +57,12 @@ Feature: User authentication and permissions | developer | Scenario Outline: Admins and developers can see and edit layouts - Given I am logged in as '<username>' - And I should see 'Layouts' - When I go to '/admin/layouts' - And I should not see 'You must have developer privileges' - And I follow 'Main' - Then I should see 'Edit Layout' + Given I am logged in as "<username>" + And I should see "Layouts" + When I go to "/admin/layouts" + And I should not see "You must have developer privileges" + And I follow "Main" + Then I should see "Edit Layout" Examples: | username | @@ -70,10 +70,10 @@ Feature: User authentication and permissions | developer | Scenario Outline: Ordinary users cannot edit layouts - Given I am logged in as '<username>' - And I should not see 'Layouts' - When I go to '/admin/layouts' - Then I should see 'You must have developer privileges' + Given I am logged in as "<username>" + And I should not see "Layouts" + When I go to "/admin/layouts" + Then I should see "You must have developer privileges" Examples: | username | @@ -81,23 +81,23 @@ Feature: User authentication and permissions | another | Scenario: Admins can see and edit users - Given I am logged in as 'admin' - And I should see 'Users' - When I go to '/admin/users' - And I should not see 'You must have administrative privileges' - And I follow 'Another' - Then I should see 'Edit User' + Given I am logged in as "admin" + And I should see "Users" + When I go to "/admin/users" + And I should not see "You must have administrative privileges" + And I follow "Another" + Then I should see "Edit User" Scenario: Admins do not see preferences link - Given I am logged in as 'admin' - And I should see 'Users' - And I should not see 'Preferences' + Given I am logged in as "admin" + And I should see "Users" + And I should not see "Preferences" Scenario Outline: Non-admins cannot see or edit users - Given I am logged in as '<username>' - And I should not see 'Users' - When I go to '/admin/users' - Then I should see 'You must have administrative privileges' + Given I am logged in as "<username>" + And I should not see "Users" + When I go to "/admin/users" + Then I should see "You must have administrative privileges" Examples: | username | @@ -106,10 +106,10 @@ Feature: User authentication and permissions | developer | Scenario Outline: Non-admins see preferences link - Given I am logged in as '<username>' - And I should see 'Preferences' - When I go to '/admin/preferences' - Then I should see 'User Preferences' + Given I am logged in as "<username>" + And I should see "Preferences" + When I go to "/admin/preferences" + Then I should see "User Preferences" Examples: | username | @@ -119,16 +119,16 @@ Feature: User authentication and permissions Scenario: Admin users can see extensions - Given I am logged in as 'admin' - And I should see 'Extensions' - When I go to '/admin/extensions' - Then I should see 'Archive' + Given I am logged in as "admin" + And I should see "Extensions" + When I go to "/admin/extensions" + Then I should see "Archive" Scenario Outline: Non-admin users cannot see extensions - Given I am logged in as '<username>' - And I should not see 'Extensions' - When I go to '/admin/extensions' - Then I should see 'You must have administrative privileges' + Given I am logged in as "<username>" + And I should not see "Extensions" + When I go to "/admin/extensions" + Then I should see "You must have administrative privileges" Examples: | username | @@ -137,9 +137,9 @@ Feature: User authentication and permissions | developer | Scenario Outline: Anyone can export YAML - Given I am logged in as '<username>' - When I go to '/admin/export' - Then I should see 'id:' + Given I am logged in as "<username>" + When I go to "/admin/export" + Then I should see "id:" Examples: | username | features/admin/user_permissions.feature @@ -4,7 +4,7 @@ Feature: Edit user preferences Scenario Outline: Edit preferences Given I am logged in as "<username>" - When I follow 'Preferences' + When I follow "Preferences" And I fill in "E-mail" with "my-new-email@example.com" And I press "Save Changes" Then I should see "updated" features/admin/user_preferences.feature @@ -3,20 +3,20 @@ Feature: Managing users As an administrator I want to manage the set of users Background: - Given I am logged in as 'admin' - And I go to '/admin/users' + Given I am logged in as "admin" + And I go to "/admin/users" Scenario: Listing users - Then I should see 'Admin' - And I should see 'Developer' - And I should see 'Existing' + Then I should see "Admin" + And I should see "Developer" + And I should see "Existing" # And a host of others Scenario: View a user When I view a user - Then I should see 'Edit User' + Then I should see "Edit User" Scenario: Create new user - When I follow 'New User' + When I follow "New User" And I fill in "Name" with "New Guy" And I fill in "E-mail" with "newguy@example.com" And I fill in "Username" with "new_guy" @@ -27,7 +27,7 @@ Feature: Managing users And I should see "New Guy" Scenario: Display form errors on submit - When I follow 'New User' + When I follow "New User" And I fill in "Name" with "New Guy" And I fill in "E-mail" with "newguy@example.com" And I press "Create User" @@ -35,7 +35,7 @@ Feature: Managing users And I should see the form Scenario: Edit existing user - When I follow 'Developer' + When I follow "Developer" Then I should see the form When I fill in "Name" with "Old Guy" And I fill in "Username" with "oldguy" @@ -47,17 +47,17 @@ Feature: Managing users Scenario: Cannot remove self When I attempt to remove my own account Then I should see an error message - And I should see 'You cannot delete yourself' + And I should see "You cannot delete yourself" Scenario: Cannot forcefully delete self When I attempt to delete my own account Then I should see an error message - And I should see 'You cannot delete yourself' + And I should see "You cannot delete yourself" Scenario: Delete other users - When I follow 'Remove' - Then I should see 'permanently remove' - And I should see 'Another' - When I press 'Delete User' - Then I should see 'been deleted' - And I should not see 'Another' \ No newline at end of file + When I follow "Remove" + Then I should see "permanently remove" + And I should see "Another" + When I press "Delete User" + Then I should see "been deleted" + And I should not see "Another" \ No newline at end of file features/admin/users_management.feature @@ -7,36 +7,36 @@ Feature: Serving pages from front-end Given the page cache is clear Scenario: Basic page rendering - When I go to page '/first' + When I go to page "/first" Then I should get a 200 response code - And I should see 'First body.' + And I should see "First body." Scenario: Rendering deeply nested page - When I go to page '/parent/child/grandchild/great-grandchild' + When I go to page "/parent/child/grandchild/great-grandchild" Then I should get a 200 response code - And I should see 'Great Grandchild body.' + And I should see "Great Grandchild body." Scenario: Apache/lighttpd acceleration Given I have turned on X-Sendfile headers - When I go to page '/first' - And I go to page '/first' + When I go to page "/first" + And I go to page "/first" Then I should get an "X-Sendfile" header in the response Scenario: nginx acceleration Given I have turned on X-Accel-Redirect headers - When I go to page '/first' - And I go to page '/first' + When I go to page "/first" + And I go to page "/first" Then I should get an "X-Accel-Redirect" header in the response Scenario: page caching enabled Given I have page caching on - When I go to page '/first' + When I go to page "/first" Then I should get an "ETag" header in the response And The "Cache-Control" header should be "public" Scenario: page caching disabled Given I have page caching off - When I go to page '/first' + When I go to page "/first" Then I should not get an "ETag" header in the response And The "Cache-Control" header should be "private" features/page_serving.feature @@ -1,4 +1,4 @@ -Given(/^I am logged in as ['"](\w+)['"]$/) do |user| +Given(/^I am logged in as "([^\"]*)"$/) do |user| visit '/admin/login' user = users(user.intern) fill_in 'Username', :with => user.login @@ -11,7 +11,7 @@ Given /^there are no pages$/ do PagePart.delete_all end -Then /^['"](.*)["'] should be selected for ['"](.*)["']$/ do |value, field| +Then /^"([^\"]*)" should be selected for "([^\"]*)"$/ do |value, field| select_box = field_labeled(field) response.should have_tag("select##{select_box.id}") do with_tag('option[selected]', :text => value) features/step_definitions/admin/admin_steps.rb @@ -1,4 +1,4 @@ -When /^I send an ["'](.*)["'] header of ['"](.*)['"]$/ do |key, value| +When /^I send an "([^\"]*)" header of "([^\"]*)"$/ do |key, value| @request_headers ||= {} @request_headers[key] = value end @@ -24,7 +24,7 @@ When /^I view a user$/ do visit "/admin/users/#{users(:admin).id}" end -When /^I request the children of page ['"](\w+)['"]$/ do |page| +When /^I request the children of page "([^\"]*)"$/ do |page| parent_page = pages(page.intern) set_headers visit "/admin/pages/#{parent_page.id}/children", :get, {"level" => "0"} features/step_definitions/admin/content_negotiation_steps.rb @@ -1,14 +1,14 @@ -When %r{^I fill in the ['"](.*)['"] content with ['"](.*)['"]$} do |part, content| +When /^I fill in the "([^\"]*)" content with "([^\"]*)"$/ do |part, content| fill_in("part_#{part.to_slug}_content", :with => content) end -Then /^there should be an? ['"](.*)["'] part$/ do |name| +Then /^there should be an? "([^\"]*)" part$/ do |name| response.should have_tag("#page-#{name.to_slug}") response.should have_tag("#part-#{name.to_slug}") response.should have_tag("textarea#part_#{name.to_slug}_content") end -When /^I edit the ['"](.*)["'] page$/ do |name| +When /^I edit the "([^\"]*)" page$/ do |name| page = pages(name.to_sym) visit "/admin/pages/#{page.id}/edit" end \ No newline at end of file features/step_definitions/admin/pages_management_steps.rb @@ -8,7 +8,7 @@ Given /^the page cache is clear$/ do Radiant::Cache.clear if defined?(Radiant::Cache) end -When(/^I go to page ['"](.*)['"]$/) do |url| +When(/^I go to page "(.*)"$/) do |url| visit url @old_headers ||= response.headers.dup end features/step_definitions/page_serving_steps.rb @@ -1,31 +1,35 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'support', 'paths')) +require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths")) # Commonly used webrat steps # http://github.com/brynary/webrat +Given /^I am on (.+)$/ do |page_name| + visit path_to(page_name) +end + # When /^I go to (.+)$/ do |page_name| # visit path_to(page_name) # end -When /^I press ["'](.*)["']$/ do |button| +When /^I press "([^\"]*)"$/ do |button| click_button(button) end -When /^I follow ["'](.*)["']$/ do |link| +When /^I follow "([^\"]*)"$/ do |link| click_link(link) end -When /^I fill in ["'](.*)["'] with ["'](.*)["']$/ do |field, value| +When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value| fill_in(field, :with => value) end -When /^I select ["'](.*)["'] from ["'](.*)["']$/ do |value, field| +When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field| select(value, :from => field) end -# Use this step in conjunction with Rails' datetime_select helper. For example: -# When I select 'December 25, 2008 10:00' as the date and time -When /^I select ["'](.*)["'] as the date and time$/ do |time| +# Use this step in conjunction with Rail's datetime_select helper. For example: +# When I select "December 25, 2008 10:00" as the date and time +When /^I select "([^\"]*)" as the date and time$/ do |time| select_datetime(time) end @@ -36,64 +40,78 @@ end # <%= f.label :alternative %><br /> # <%= f.datetime_select :alternative %> # The following steps would fill out the form: -# When I select 'November 23, 2004 11:20' as the 'Preferred' data and time -# And I select 'November 25, 2004 10:30' as the 'Alternative' data and time -When /^I select ["'](.*)["'] as the ["'](.*)["'] date and time$/ do |datetime, datetime_label| +# When I select "November 23, 2004 11:20" as the "Preferred" date and time +# And I select "November 25, 2004 10:30" as the "Alternative" date and time +When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label| select_datetime(datetime, :from => datetime_label) end -# Use this step in conjuction with Rail's time_select helper. For example: -# When I select '2:20PM' as the time -# Note: Rails' default time helper provides 24-hour time-- not 12 hour time. Webrat +# Use this step in conjunction with Rail's time_select helper. For example: +# When I select "2:20PM" as the time +# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat # will convert the 2:20PM to 14:20 and then select it. -When /^I select ["'](.*)["'] as the time$/ do |time| +When /^I select "([^\"]*)" as the time$/ do |time| select_time(time) end # Use this step when using multiple time_select helpers on a page or you want to # specify the name of the time on the form. For example: -# When I select '7:30AM' as the 'Gym' time -When /^I select ["'](.*)["'] as the ["'](.*)["'] time$/ do |time, time_label| +# When I select "7:30AM" as the "Gym" time +When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label| select_time(time, :from => time_label) end -# Use this step in conjuction with Rail's date_select helper. For example: -# When I select 'February 20, 1981' as the date -When /^I select ["'](.*)["'] as the date$/ do |date| +# Use this step in conjunction with Rail's date_select helper. For example: +# When I select "February 20, 1981" as the date +When /^I select "([^\"]*)" as the date$/ do |date| select_date(date) end # Use this step when using multiple date_select helpers on one page or # you want to specify the name of the date on the form. For example: -# When I select 'April 26, 1982' as the 'Date of Birth' date -When /^I select ["'](.*)["'] as the ["'](.*)["'] date$/ do |date, date_label| +# When I select "April 26, 1982" as the "Date of Birth" date +When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label| select_date(date, :from => date_label) end -When /^I check ["'](.*)["']$/ do |field| +When /^I check "([^\"]*)"$/ do |field| check(field) end -When /^I uncheck ["'](.*)["']$/ do |field| +When /^I uncheck "([^\"]*)"$/ do |field| uncheck(field) end -When /^I choose ["'](.*)["']$/ do |field| +When /^I choose "([^\"]*)"$/ do |field| choose(field) end -When /^I attach the file at ["'](.*)["'] to ["'](.*)["'] $/ do |path, field| +When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field| attach_file(field, path) end -Then /^I should see ["'](.*)["']$/ do |text| - response.body.should =~ /#{text}/m +Then /^I should see "([^\"]*)"$/ do |text| + # response.should contain(text) + response.body.should match(Regexp.new(text)) +end + +Then /^I should not see "([^\"]*)"$/ do |text| + # response.should_not contain(text) + response.body.should_not match(Regexp.new(text)) end -Then /^I should not see ["'](.*)["']$/ do |text| - response.body.should_not =~ /#{text}/m +Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value| + field_labeled(field).value.should =~ /#{value}/ end -Then /^the ["'](.*)["'] checkbox should be checked$/ do |label| +Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value| + field_labeled(field).value.should_not =~ /#{value}/ +end + +Then /^the "([^\"]*)" checkbox should be checked$/ do |label| field_labeled(label).should be_checked end + +Then /^I should be on (.+)$/ do |page_name| + URI.parse(current_url).path.should == path_to(page_name) +end features/step_definitions/webrat_steps.rb @@ -3,7 +3,7 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(Dir.pwd + '/config/environment') require 'cucumber/rails/world' -require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support +require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support require 'webrat' Webrat.configure do |config| features/support/env.rb @@ -1,12 +1,17 @@ -$:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') +$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib') + begin require 'cucumber/rake/task' + Cucumber::Rake::Task.new(:features) do |t| - t.cucumber_opts = "--format pretty #{RADIANT_ROOT}/features" + t.fork = true + t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')] + t.feature_pattern = "#{RADIANT_ROOT}/features/**/*.feature" end task :features => 'db:test:prepare' rescue LoadError + desc 'Cucumber rake task not available' task :features do - puts "Required dependency Cucumber is missing.\nRun 'rake gems:install RAILS_ENV=test'" + abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin' end -end \ No newline at end of file +end lib/tasks/cucumber.rake @@ -72,7 +72,8 @@ begin end end Cucumber::Rake::Task.new(:integration) do |t| - t.cucumber_opts = "--format progress #{RADIANT_ROOT}/features" + t.cucumber_opts = ["--format","progress"] + t.feature_pattern = "#{RADIANT_ROOT}/features/**/*.feature" end desc 'Run all specs in spec/generators directory' lib/tasks/rspec.rake @@ -1,7 +1,8 @@ #!/usr/bin/env ruby begin load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber") -rescue LoadError +rescue LoadError => e + raise unless e.to_s =~ /cucumber/ require "rubygems" load File.join(Gem.bindir, "cucumber") end \ No newline at end of file script/cucumber @@ -35,4 +35,10 @@ describe Admin::PreferencesController do user = users(:non_admin) user.password.should == user.sha1('funtimes') end + + it "should use the User.protected_attributes for checking valid_params?" do + User.should_receive(:protected_attributes).at_least(:once).and_return([:password, :password_confirmation, :email]) + login_as :non_admin + put :update, { :user => { :password => 'funtimes', :password_confirmation => 'funtimes' } } + end end spec/controllers/admin/preferences_controller_spec.rb @@ -23,9 +23,9 @@ describe Admin::WelcomeController do end it "should render the login template when login failed" do + controller.should_receive(:announce_invalid_user) # Can't test flash.now! post :login, :user => {:login => "admin", :password => "wrong"} response.should render_template("login") - flash[:error].should_not be_nil end describe "remember me" do spec/controllers/admin/welcome_controller_spec.rb @@ -17,6 +17,21 @@ describe User, "validations" do assert_valid :email, ('x' * 246) + '@test.com' end + + describe "self.protected_attributes" do + it "should be an array of [:password, :password_confirmation, :email]" do + # Make sure we clean up after anything set in another spec + User.instance_variable_set(:@protected_attributes, nil) + User.protected_attributes.should == [:password, :password_confirmation, :email] + end + end + describe "self.protected_attributes=" do + it "should set the @@protected_attributes variable to the given array" do + User.protected_attributes = [:password, :email, :other] + User.protected_attributes.should == [:password, :email, :other] + end + end + it 'should validate length ranges' do { :login => 3..40, spec/models/user_spec.rb afa15789ae7fe68086b4b16c6dbe99bf54d07a50 Sean Cribbs seancribbs@gmail.com http://github.com/radiant/radiant/commit/219f2bf0419673beaebfee30af3cac94567bcd39 219f2bf0419673beaebfee30af3cac94567bcd39 2009-06-06T10:35:16-07:00 2009-06-06T10:35:16-07:00 Update Cucumber and RSpec, clean up some features and fix specs. 094a28183d3124ff30bbc39ca85db32c2ae24b61 Sean Cribbs seancribbs@gmail.com