rspec-rails 2.0.0.a8 → 2.0.0.a9

data/README.markdown

@@ -27,7 +27,7 @@ Configure:
 
 Add this line to the Gemfile:
 
-    gem "rspec-rails", ">= 2.0.0.a7"
+    gem "rspec-rails", ">= 2.0.0.a9"
 
 This will expose generators, including rspec:install. Now you can run: 
 
@@ -50,6 +50,8 @@ Currently supported:
 * controller specs in spec/controllers
   * no view isolation yet
 * view specs in spec/views
+* mailer specs in spec/mailers
+* observer specs in spec/models
 * request specs in spec/requests
   * these wrap rails integration tests
 * rails assertions

data/VERSION

@@ -1 +1 @@
-2.0.0.a8
+2.0.0.a9

data/example_app_template.rb

@@ -2,17 +2,26 @@ $LOAD_PATH.unshift(File.expand_path('../../../lib', __FILE__))
 require 'rspec/rails/version'
 # This needs to be installed on the system, as well as all of its rspec-2 deps
 # - would be nicer if we could source them from the <repo>/pkg dirs
-gem 'rspec-rails', :version => Rspec::Rails::Version::STRING
+gem 'rspec-rails', :path => File.expand_path('../../../', __FILE__)
 
 run('bundle install')
 
 run('script/rails g rspec:install')
-run('script/rails g model thing name:string')
-run('script/rails g scaffold widgets name:string')
 run('script/rails g controller wombats index')
 run('script/rails g integration_test widgets')
+run('script/rails g mailer Notifications signup')
+run('script/rails g model thing name:string')
+run('script/rails g observer widget')
+run('script/rails g scaffold widgets name:string')
 
 run('rake db:migrate')
 run('rake db:test:prepare')
 run('rspec spec -cfdoc')
 run('rake spec')
+run('rake spec:requests')
+run('rake spec:models')
+run('rake spec:views')
+run('rake spec:controllers')
+run('rake spec:helpers')
+run('rake spec:mailers')
+run('rake stats')

data/lib/generators/rspec/controller/templates/view_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-describe "/<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>" do
-  #Delete this example and add some real ones or delete this file
-  it "should tell you where to find the file" do
-    render
-    response.should have_selector('p', :content => "Find me in app/views/<%= file_path %>/<%= @action %>")
-  end
+describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>" do
+  pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -11,4 +11,5 @@ require 'spec_helper'
 #   end
 # end
 describe <%= class_name %>Helper do
+  pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/install/templates/lib/tasks/rspec.rake

@@ -38,82 +38,32 @@ task :stats => "spec:statsetup"
 desc "Run all specs in spec directory (excluding plugin specs)"
 Rspec::Core::RakeTask.new(:spec => spec_prereq)
 
-# namespace :spec do
-  # desc "Run all specs in spec directory with RCov (excluding plugin specs)"
-  # Rspec::Core::RakeTask.new(:rcov) do |t|
-    # t.spec_opts = ['--options', "\"#{Rails.root}/spec/spec.opts\""]
-    # t.spec_files = FileList['spec/**/*_spec.rb']
-    # t.rcov = true
-    # t.rcov_opts = lambda do
-      # IO.readlines("#{Rails.root}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-    # end
-  # end
-
-  # desc "Print Rspecdoc for all specs (excluding plugin specs)"
-  # Rspec::Core::RakeTask.new(:doc) do |t|
-    # t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    # t.spec_files = FileList['spec/**/*_spec.rb']
-  # end
-
-  # desc "Print Rspecdoc for all plugin examples"
-  # Rspec::Core::RakeTask.new(:plugin_doc) do |t|
-    # t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    # t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
-  # end
-
-  # [:models, :controllers, :views, :helpers, :lib, :integration].each do |sub|
-    # desc "Run the code examples in spec/#{sub}"
-    # Rspec::Core::RakeTask.new(sub => spec_prereq) do |t|
-      # t.spec_opts = ['--options', "\"#{Rails.root}/spec/spec.opts\""]
-      # t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-    # end
-  # end
-
-  # desc "Run the code examples in vendor/plugins (except RRspec's own)"
-  # Rspec::Core::RakeTask.new(:plugins => spec_prereq) do |t|
-    # t.spec_opts = ['--options', "\"#{Rails.root}/spec/spec.opts\""]
-    # t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
-  # end
-
-  # namespace :plugins do
-    # desc "Runs the examples for rspec_on_rails"
-    # Rspec::Core::RakeTask.new(:rspec_on_rails) do |t|
-      # t.spec_opts = ['--options', "\"#{Rails.root}/spec/spec.opts\""]
-      # t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb']
-    # end
-  # end
-
-  # task :statsetup do
-    # require 'code_statistics'
-    # ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-    # ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-    # ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-    # ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-    # ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-    # ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
-    # ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration')
-    # ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-    # ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-    # ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-    # ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-    # ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    # ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-    # ::CodeStatistics::TEST_TYPES << "Integration specs" if File.exist?('spec/integration')
-  # end
+namespace :spec do
+  [:requests, :models, :controllers, :views, :helpers, :mailers, :lib].each do |sub|
+    desc "Run the code examples in spec/#{sub}"
+    Rspec::Core::RakeTask.new(sub => spec_prereq) do |t|
+      t.pattern = "./spec/#{sub}/**/*_spec.rb"
+    end
+  end
 
-  # namespace :db do
-    # namespace :fixtures do
-      # desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
-      # task :load => :environment do
-        # ActiveRecord::Base.establish_connection(Rails.env)
-        # base_dir = File.join(Rails.root, 'spec', 'fixtures')
-        # fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+  task :statsetup do
+    require 'rails/code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES << %w(Mailer\ specs spec/mailers) if File.exist?('spec/mailers')
+    ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
+    ::STATS_DIRECTORIES << %w(Request\ specs spec/requests) if File.exist?('spec/requests')
+    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
+    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+    ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailer')
+    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
+    ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
+  end
+end
 
-        # require 'active_record/fixtures'
-        # (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
-          # Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
-        # end
-      # end
-    # end
-  # end
-# end

data/lib/generators/rspec/mailer/mailer_generator.rb

@@ -5,9 +5,8 @@ module Rspec
     class MailerGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "method method"
 
-      def create_mailer_files
-        template "mailer_spec.rb",
-                 File.join('spec', 'models', class_path, "#{file_name}_spec.rb")
+      def create_spec_files
+        template "mailer_spec.rb", File.join('spec/mailers', class_path, "#{file_name}_spec.rb")
       end
 
       def create_fixtures_files

data/lib/generators/rspec/mailer/templates/fixture

@@ -1,3 +1,3 @@
 <%= class_name %>#<%= @action %>
 
-Find me in app/views/<%= @path %>
+Hi, find me in app/views/<%= @path %>

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -3,11 +3,12 @@ require 'spec_helper'
 describe <%= class_name %> do
 <% for action in actions -%>
   it "should deliver <%= action.gsub("_", " ") %> message" do
-    @expected.subject = '<%= class_name %>#<%= action %>'
-    @expected.body    = read_fixture('<%= action %>')
-    @expected.date    = Time.now
+    @expected.subject = <%= action.to_s.humanize.inspect %>
+    @expected.to      = "to@example.org"
+    @expected.from    = "from@example.com"
+    @expected.body    = read_fixture("<%= action %>")
 
-    @expected.encoded.should == <%= class_name %>.create_<%= action %>(@expected.date).encoded
+    @expected.should == <%= class_name %>.<%= action %>
   end
 
 <% end -%>

data/lib/generators/rspec/model/templates/model_spec.rb

@@ -1,13 +1,5 @@
 require 'spec_helper'
 
 describe <%= class_name %> do
-  before(:each) do
-    @valid_attributes = {
-      <%= attributes.map{ |a| ":#{a.name} => #{a.default.inspect}" }.join(",\n      ") %>
-    }
-  end
-
-  it "should create a new instance given valid attributes" do
-    <%= class_name %>.create!(@valid_attributes)
-  end
+  pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe <%= class_name %> do
-
+describe <%= class_name %>Observer do
+  pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "/<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
+describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
 
   before(:each) do

data/lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "/<%= table_name %>/index.html.<%= options[:template_engine] %>" do
+describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
 
   before(:each) do

data/lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "/<%= table_name %>/new.html.<%= options[:template_engine] %>" do
+describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
 
   before(:each) do

data/lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "/<%= table_name %>/show.html.<%= options[:template_engine] %>" do
+describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
   before(:each) do
     assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>

data/lib/generators/rspec/view/templates/view_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-describe "/<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>" do
-  #Delete this example and add some real ones or delete this file
-  it "should tell you where to find the file" do
-    render
-    response.should have_selector('p', :content => "Find me in app/views/<%= file_path %>/<%= @action %>")
-  end
+describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>" do
+  pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/rspec/rails/example.rb

@@ -1,3 +1,4 @@
 require 'rspec/rails/example/controller_example_group'
 require 'rspec/rails/example/request_example_group'
 require 'rspec/rails/example/view_example_group'
+require 'rspec/rails/example/mailer_example_group'

data/lib/rspec/rails/example/mailer_example_group.rb

@@ -0,0 +1,18 @@
+module MailerExampleGroupBehavior
+
+  def read_fixture(action)
+    IO.readlines(File.join(Rails.root, 'spec', 'fixtures', self.described_class.name.underscore, action))
+  end
+
+  Rspec.configure do |c|
+    c.include self, :example_group => { :describes => lambda {|k| k < ActionMailer::Base }}
+    c.before :each, :example_group => { :describes => lambda {|k| k < ActionMailer::Base }} do
+      ActionMailer::Base.delivery_method = :test
+      ActionMailer::Base.perform_deliveries = true
+      ActionMailer::Base.deliveries.clear
+      @expected = Mail.new
+      @expected.content_type ["text", "plain", { "charset" => "utf-8" }]
+      @expected.mime_version = '1.0'
+    end
+  end
+end

data/lib/rspec/rails/example/view_example_group.rb

@@ -3,7 +3,9 @@ require 'webrat'
 module ViewExampleGroupBehaviour
   include Webrat::Matchers
 
-  class ViewExampleController < ActionController::Base; end
+  class ViewExampleController < ActionController::Base
+    attr_accessor :controller_path
+  end
 
   module ViewExtensions
     def protect_against_forgery?; end
@@ -29,8 +31,18 @@ module ViewExampleGroupBehaviour
     @response
   end
 
+  def file_to_render
+    running_example.metadata[:example_group][:description]
+  end
+
+  def controller_path
+    parts = file_to_render.split('/')
+    parts.pop
+    parts.join('/')
+  end
+
   def render
-    @response = view.render :file => running_example.metadata[:example_group][:description]
+    @response = view.render :file => file_to_render
   end
 
   def method_missing(selector, *args)
@@ -48,7 +60,11 @@ module ViewExampleGroupBehaviour
 private
 
   def controller
-    @controller ||= ViewExampleController.new
+    @controller ||= begin
+                      controller = ViewExampleController.new
+                      controller.controller_path = controller_path
+                      controller
+                    end
   end
 
 end

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module Rspec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = File.read(File.expand_path('../../../../VERSION', __FILE__))
+      STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first
     end
   end
 end

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.a8"
+  s.version = "2.0.0.a9"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-02-21}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -41,9 +41,6 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/model/templates/model_spec.rb",
      "lib/generators/rspec/observer/observer_generator.rb",
      "lib/generators/rspec/observer/templates/observer_spec.rb",
-     "lib/generators/rspec/plugin/plugin_generator.rb",
-     "lib/generators/rspec/plugin/templates/%file_name%_spec.rb.tt",
-     "lib/generators/rspec/plugin/templates/test_helper.rb",
      "lib/generators/rspec/scaffold/scaffold_generator.rb",
      "lib/generators/rspec/scaffold/templates/controller_spec.rb",
      "lib/generators/rspec/scaffold/templates/edit_spec.rb",
@@ -57,6 +54,7 @@ Gem::Specification.new do |s|
      "lib/rspec/rails.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
+     "lib/rspec/rails/example/mailer_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
      "lib/rspec/rails/example/view_example_group.rb",
      "lib/rspec/rails/matchers.rb",
@@ -68,7 +66,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rspec-2 for Rails-3}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a8
+  prerelease: true
+  segments: 
+  - 2
+  - 0
+  - 0
+  - a9
+  version: 2.0.0.a9
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,29 +16,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -06:00
+date: 2010-02-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - a7
         version: 2.0.0.a7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: webrat
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -68,9 +83,6 @@ files:
 - lib/generators/rspec/model/templates/model_spec.rb
 - lib/generators/rspec/observer/observer_generator.rb
 - lib/generators/rspec/observer/templates/observer_spec.rb
-- lib/generators/rspec/plugin/plugin_generator.rb
-- lib/generators/rspec/plugin/templates/%file_name%_spec.rb.tt
-- lib/generators/rspec/plugin/templates/test_helper.rb
 - lib/generators/rspec/scaffold/scaffold_generator.rb
 - lib/generators/rspec/scaffold/templates/controller_spec.rb
 - lib/generators/rspec/scaffold/templates/edit_spec.rb
@@ -84,6 +96,7 @@ files:
 - lib/rspec/rails.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
+- lib/rspec/rails/example/mailer_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
 - lib/rspec/rails/example/view_example_group.rb
 - lib/rspec/rails/matchers.rb
@@ -104,18 +117,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rspec-2 for Rails-3

data/lib/generators/rspec/plugin/plugin_generator.rb

@@ -1,11 +0,0 @@
-require 'generators/rspec'
-
-module Rspec
-  module Generators
-    class PluginGenerator < Base
-      def create_spec_files
-        directory '.', 'spec'
-      end
-    end
-  end
-end

data/lib/generators/rspec/plugin/templates/%file_name%_spec.rb.tt

@@ -1,5 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper.rb'))
-
-describe <%= class_name %> do
-
-end

data/lib/generators/rspec/plugin/templates/test_helper.rb

@@ -1,5 +0,0 @@
-$TESTING=true
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-Spec::Runner.configure do |config|
-end