prologue 0.3.6 → 0.3.7

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    prologue (0.3.1)
-      rails (>= 3.0.0)
+    prologue (0.3.7)
+      rails (~> 3.0.0)
       thor
 
 GEM
@@ -105,6 +105,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   cucumber
   prologue!
-  rails (>= 3.0.0)
+  rails (~> 3.0.0)
   rspec (~> 2.0.0)
   thor

data/lib/prologue/version.rb

@@ -1,3 +1,3 @@
 module Prologue
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/prologue.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.summary     = "prologue-#{s.version}"
   s.description = "Generate a Rails 3 app with application templates Quick Left uses to start their projects off right!"
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_rubygems_version = "~> 1.3.6"
   s.rubyforge_project         = "prologue"
 
   s.add_dependency "thor"
-  s.add_dependency('rails', '>= 3.0.0')
+  s.add_dependency('rails', '~> 3.0.0')
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba" 

data/templates/admin/cucumber.rb

@@ -17,7 +17,7 @@ Feature: Admin dashboard
   So that I can have full control over the site
 
   Scenario: Login as an admin
-    Given a logged in admin user
+    Given a logged in admin
     When I am on the admin
     Then I should see "Admin"
 FILE
@@ -34,14 +34,15 @@ Feature: Administer users
     Given the following role records
     | name   |
     | Member |
+    And a logged in admin
 
   Scenario: Create, update, delete a user in the admin
-    Given a logged in admin user
     When I am on the add user page
-    And I fill in "Name" with "Big Boi"
-    And I fill in "Email" with "big@sirluciousleftfoot.com"
-    And I fill in "Password" with "Ch!coDusty$"
-    And I fill in "Password confirmation" with "Ch!coDusty$"
+    And I fill in the following:
+    | Email                 | big@sirluciousleftfoot.com |
+    | Name                  | Big Boi                    |
+    | Password              | Ch!coDusty$                |
+    | Password confirmation | Ch!coDusty$                |
     And I check "Member"
     And I press "Save"
     Then I should see "User created!"

data/templates/admin/layout.rb

@@ -25,6 +25,8 @@ create_file 'app/views/admin/shared/_messages.html.haml' do
   %div#messenger{:class => "flasher"}= flash[:notice]
 - if flash[:error]
   %div#error{:class => "flasher"}= flash[:error]
+- if flash[:alert]
+  %div#alert{:class => "flasher"}= flash[:alert]
 FILE
 end
 

data/templates/application_layout.rb

@@ -17,6 +17,8 @@ create_file 'app/views/shared/_messages.html.haml' do
   %div#messenger{:class => "flasher"}= flash[:notice]
 - if flash[:error]
   %div#error{:class => "flasher"}= flash[:error]
+- if flash[:alert]
+  %div#alert{:class => "flasher"}= flash[:alert]
 FILE
 end
 

data/templates/devise/cucumber.rb

@@ -3,7 +3,7 @@ create_file 'spec/factories/user.rb' do
 <<-'FILE'
 Factory.define :user do |u| 
   u.sequence(:name) { |n| "Quick #{n}" }
-  u.sequence(:email) { |n| "info.#{n}@quickleft.com" }
+  u.sequence(:email) { |n| "user.#{n}@quickleft.com" }
   u.password "password" 
   u.confirmed_at Time.new.to_s
   u.confirmation_sent_at Time.new.to_s
@@ -11,7 +11,7 @@ Factory.define :user do |u|
 end 
 
 Factory.define :admin, :parent => :user do |admin| 
-  admin.email "quickleft@quickleft.com"
+  admin.email "admin@quickleft.com"
   admin.password "password" 
   admin.roles { [ Factory(:role, :name => 'Admin') ] }
 end 
@@ -37,18 +37,10 @@ When /^I log in as "([^\"]*)" with password "([^\"]*)"$/ do |email, password|
   click_button("Sign in")
 end
 
-Given /^a logged in admin user$/ do
-  Factory.create(:admin)
+Given /^a logged in (\w+)$/ do |usertype|
+  Factory.create(usertype.to_sym)
   visit(new_user_session_path)
-  fill_in("user[email]", :with => "quickleft@quickleft.com")
-  fill_in("user[password]", :with => "password")
-  click_button("Sign in")
-end
-
-Given /^a logged in member user$/ do
-  Factory.create(:member)
-  visit(new_user_session_path)
-  fill_in("user[email]", :with => "member@quickleft.com")
+  fill_in("user[email]", :with => "#{usertype}@quickleft.com")
   fill_in("user[password]", :with => "password")
   click_button("Sign in")
 end
@@ -57,8 +49,8 @@ When /^I log out$/ do
   visit(destroy_user_session_path)
 end
 
-Given /^a user "([^\"]*)"$/ do |email|
-  Factory.create(:user, :email => email)
+Given /^an? (\w+) "([^\"]*)"$/ do |usertype, email|
+  Factory.create(usertype.to_sym, :email => email)
 end
 FILE
 end

data/templates/gemfile.rb

@@ -3,7 +3,7 @@ create_file 'Gemfile', "source 'http://rubygems.org'\n"
 gem "rails", "~> 3.0.0"
 gem "sqlite3-ruby", :require => "sqlite3"
 if ENV['PROLOGUE_AUTH']
-  gem 'devise', ">= 1.1.3"
+  gem 'devise', "~> 1.1.3"
 end
 if ENV['PROLOGUE_ROLES']
   gem 'cancan'
@@ -12,7 +12,7 @@ gem "hoptoad_notifier"
 gem "jammit"
 gem "friendly_id", "~> 3.1"
 gem "will_paginate", "~> 3.0.pre2"
-gem "haml", ">= 3.0.21"
+gem "haml", "~> 3.0.21"
 gem "rails3-generators", :group => :development
 gem "hpricot", :group => :development
 gem "ruby_parser", :group => :development
@@ -26,7 +26,7 @@ gem "thin", :group => [:test, :cucumber, :development]
 gem "cucumber", :group => [:cucumber]
 gem "database_cleaner", :group => [:test, :cucumber]
 gem "cucumber-rails", :group => [:cucumber]
-gem "capybara", "0.4.0", :group => [:cucumber]
+gem "capybara", "~> 0.4.0", :group => [:cucumber]
 gem "launchy", :group => [:cucumber]
 gem "timecop", :group => [:test, :cucumber]
 gem "pickle", :group => [:test, :cucumber]

data/templates/test_suite.rb

@@ -20,12 +20,29 @@ gsub_file 'features/support/env.rb',/require 'cucumber\/rails\/capybara_javascri
 
 run 'mkdir spec/factories'
 
-create_file 'features/step_definitions/helper_steps.rb' do
+create_file 'features/step_definitions/web_steps_extended.rb' do
 <<-'FILE'
 When /^I confirm a js popup on the next step$/ do
   page.evaluate_script("window.alert = function(msg) { return true; }")
   page.evaluate_script("window.confirm = function(msg) { return true; }")
 end
+
+When /^I perform the following actions:$/ do |table|
+  table.hashes.each do |row|
+    case row['Action']
+    when 'Fill in'
+      Given "I fill in \"#{row['Field']}\" with \"#{row['Value']}\""
+    when 'Check'
+      if row['Value'] =~ /true/
+        Given "I check \"#{row['Field']}\""
+      else
+        Given "I uncheck \"#{row['Field']}\""
+      end
+    when 'Choose'
+      Given "I choose \"#{row['Field']}\""
+    end
+  end
+end
 FILE
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Quick Left
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -06:00
+date: 2010-11-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
       segments: 
       - 1
@@ -184,6 +184,6 @@ rubyforge_project: prologue
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: prologue-0.3.6
+summary: prologue-0.3.7
 test_files: []