rspec-rails 2.0.0.a7 → 2.0.0.a8

data/README.markdown

@@ -8,18 +8,13 @@ either rspec or rails.
 
 ### Current state
 
-Currently in super-pre-alpha state - explore at your own risk!
+Currently in alpha - some things work, some not so much - see Known Issues,
+below
 
 Install:
 
     gem install rspec-rails --pre
 
-Build from source and install:
-
-    git clone git://github.com/rspec/rspec-dev
-    cd rspec-dev
-    rake
-
 This installs the following gems:
 
 * rspec
@@ -28,6 +23,22 @@ This installs the following gems:
 * rspec-mocks
 * rspec-rails
 
+Configure:
+
+Add this line to the Gemfile:
+
+    gem "rspec-rails", ">= 2.0.0.a7"
+
+This will expose generators, including rspec:install. Now you can run: 
+
+    script/rails g rspec:install
+
+This adds the spec directory and some skeleton files, including
+the "rake spec" task.
+
+Note that things are in flux, so some generators generate code that
+doesn't work all that well yet.
+
 ### What works (and what doesn't)
 
 Currently supported:
@@ -38,6 +49,7 @@ Currently supported:
 * model specs in spec/models
 * controller specs in spec/controllers
   * no view isolation yet
+* view specs in spec/views
 * request specs in spec/requests
   * these wrap rails integration tests
 * rails assertions
@@ -47,10 +59,10 @@ Currently supported:
     * template must exist (unlike rspec-rails-1.x)
 * webrat matchers
 * generators
+  * run "script/rails g" to see the list of available generators
 
 ### Known issues
 
-* no view specs
 * no helper specs
 * no routing specs
 * only works with ActiveRecord

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
-    gem.add_dependency "rspec", ">= 2.0.0.a6"
+    gem.add_dependency "rspec", ">= 2.0.0.a7"
     gem.add_dependency "webrat", ">= 0.7.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -0,0 +1 @@
+2.0.0.a8

data/example_app_template.rb

@@ -7,12 +7,12 @@ gem 'rspec-rails', :version => Rspec::Rails::Version::STRING
 run('bundle install')
 
 run('script/rails g rspec:install')
-# run('script/rails g model thing name:string')
+run('script/rails g model thing name:string')
 run('script/rails g scaffold widgets name:string')
-# run('script/rails g controller widgets index')
-# run('script/rails g integration_test widgets')
+run('script/rails g controller wombats index')
+run('script/rails g integration_test widgets')
 
 run('rake db:migrate')
 run('rake db:test:prepare')
-run('rspec spec')
+run('rspec spec -cfdoc')
 run('rake spec')

data/lib/generators/rspec/controller/controller_generator.rb

@@ -7,7 +7,7 @@ module Rspec
 
       class_option :template_engine, :desc => "Template engine to generate view files"
       class_option :controllers, :type => :boolean, :default => true
-      class_option :views,       :type => :boolean, :default => false
+      class_option :views,       :type => :boolean, :default => true
 
       def create_controller_files
         return unless options[:controllers]

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

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

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 # Specs in this file have access to a helper object that includes
 # the <%= class_name %>Helper. For example:
 # 
-# describe <%= class_name %>Helper 
+# describe <%= class_name %>Helper do
 #   describe "string concat" do
 #     it "concats two strings with spaces" do
 #       helper.concat_strings("this","that").should == "this that"

data/lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt

@@ -1,15 +1,6 @@
 <%= app_name %>.configure do
-  # We're still in alpha, so we're only generating model specs
-  # and request (integration) specs. We'll change these defaults
-  # as we add support for controller specs, etc.
   config.generators do |g|
     g.integration_tool :rspec
-    g.test_framework   :rspec,
-                       :fixture     => false,
-                       :views       => false,
-                       :helpers     => false,
-                       :routes      => false,
-                       :integration => true
-
+    g.test_framework   :rspec
   end
 end

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -12,7 +12,7 @@ module Rspec
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
       class_option :controllers, :type => :boolean, :default => true
-      class_option :views,       :type => :boolean, :default => false
+      class_option :views,       :type => :boolean, :default => true
       class_option :routes,      :type => :boolean, :default => false
 
       def copy_controller_files

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

@@ -5,20 +5,20 @@ describe "/<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
 
   before(:each) do
-    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>,
+    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %>,
       :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-    )
+    ))
   end
 
   it "renders the edit <%= file_name %> form" do
     render
 
-    response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
+    response.should have_selector("form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]")
+      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
   end

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

@@ -5,7 +5,7 @@ describe "/<%= table_name %>/index.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
 
   before(:each) do
-    assigns[:<%= table_name %>] = [
+    assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
       stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
@@ -15,13 +15,13 @@ describe "/<%= table_name %>/index.html.<%= options[:template_engine] %>" do
       <%= model_index == 1 ? ')' : '),' %>
 <% end -%>
 <% end -%>
-    ]
+    ])
   end
 
   it "renders a list of <%= table_name %>" do
     render
 <% for attribute in output_attributes -%>
-    response.should have_tag("tr>td", <%= attribute.default.inspect %>.to_s, 2)
+    response.should have_selector("tr>td", :content => <%= attribute.default.inspect %>.to_s, :count => 2)
 <% end -%>
   end
 end

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

@@ -5,20 +5,20 @@ describe "/<%= table_name %>/new.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
 
   before(:each) do
-    assigns[:<%= file_name %>] = stub_model(<%= class_name %>,
+    assign(:<%= file_name %>, stub_model(<%= class_name %>,
       :new_record? => true<%= output_attributes.empty? ? '' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-    )
+    ))
   end
 
   it "renders new <%= file_name %> form" do
     render
 
-    response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
+    response.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]")
+      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
   end

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

@@ -4,19 +4,19 @@ require 'spec_helper'
 describe "/<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   include <%= controller_class_name %>Helper
   before(:each) do
-    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>
+    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
-    )
+    ))
 <% end -%>
   end
 
   it "renders attributes in <p>" do
     render
 <% for attribute in output_attributes -%>
-    response.should have_text(/<%= Regexp.escape(attribute.default.inspect).gsub(/^"|"$/, '')%>/)
+    response.should contain(<%= attribute.default.inspect %>)
 <% end -%>
   end
 end

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

@@ -0,0 +1,9 @@
+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
+end

data/lib/generators/rspec/view/view_generator.rb

@@ -0,0 +1,21 @@
+require 'generators/rspec'
+
+module Rspec
+  module Generators
+    class ViewGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "action action"
+
+      class_option :template_engine, :desc => "Template engine to generate view files"
+
+      def create_view_files
+        empty_directory File.join("spec", "views", file_path)
+
+        actions.each do |action|
+          @action = action
+          template 'view_spec.rb',
+                   File.join("spec", "views", file_path, "#{@action}.html.#{options[:template_engine]}_spec.rb")
+        end
+      end
+    end
+  end
+end

data/lib/rspec/rails/example.rb

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

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

@@ -0,0 +1,54 @@
+require 'webrat'
+
+module ViewExampleGroupBehaviour
+  include Webrat::Matchers
+
+  class ViewExampleController < ActionController::Base; end
+
+  module ViewExtensions
+    def protect_against_forgery?; end
+  end
+
+  def view
+    @view ||= begin
+                view = ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
+                view.extend ViewExtensions
+                view
+              end
+  end
+
+  def assign(name, value)
+    assigns[name] = value
+  end
+
+  def assigns
+    @assigns ||= {}
+  end
+
+  def response
+    @response
+  end
+
+  def render
+    @response = view.render :file => running_example.metadata[:example_group][:description]
+  end
+
+  def method_missing(selector, *args)
+    if ActionController::Routing::Routes.named_routes.helpers.include?(selector)
+      controller.__send__(selector, *args)
+    else
+      super
+    end
+  end
+
+  Rspec.configure do |c|
+    c.include self, :example_group => { :file_path => /\bspec\/views\// }
+  end
+
+private
+
+  def controller
+    @controller ||= ViewExampleController.new
+  end
+
+end

data/lib/rspec/rails/version.rb

@@ -1,16 +1,7 @@
 module Rspec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      unless defined?(MAJOR)
-        MAJOR  = 2
-        MINOR  = 0
-        TINY   = 0
-        PRE    = 'a7'
-
-        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-
-        SUMMARY = "rspec-core " + STRING
-      end
+      STRING = File.read(File.expand_path('../../../../VERSION', __FILE__))
     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.a7"
+  s.version = "2.0.0.a8"
 
   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-15}
+  s.date = %q{2010-02-20}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
     ".gitignore",
      "README.markdown",
      "Rakefile",
+     "VERSION",
      "example_app_template.rb",
      "lib/generators/rspec.rb",
      "lib/generators/rspec/controller/controller_generator.rb",
@@ -50,11 +51,14 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/scaffold/templates/new_spec.rb",
      "lib/generators/rspec/scaffold/templates/routing_spec.rb",
      "lib/generators/rspec/scaffold/templates/show_spec.rb",
+     "lib/generators/rspec/view/templates/view_spec.rb",
+     "lib/generators/rspec/view/view_generator.rb",
      "lib/rspec-rails.rb",
      "lib/rspec/rails.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
      "lib/rspec/rails/example/request_example_group.rb",
+     "lib/rspec/rails/example/view_example_group.rb",
      "lib/rspec/rails/matchers.rb",
      "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/transactional_database_support.rb",
@@ -72,14 +76,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a6"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a7"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.a6"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.a7"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.a6"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.a7"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a7
+  version: 2.0.0.a8
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -04:00
+date: 2010-02-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a6
+        version: 2.0.0.a7
     version: 
 - !ruby/object:Gem::Dependency 
   name: webrat
@@ -45,6 +45,7 @@ files:
 - .gitignore
 - README.markdown
 - Rakefile
+- VERSION
 - example_app_template.rb
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
@@ -77,11 +78,14 @@ files:
 - lib/generators/rspec/scaffold/templates/new_spec.rb
 - lib/generators/rspec/scaffold/templates/routing_spec.rb
 - lib/generators/rspec/scaffold/templates/show_spec.rb
+- lib/generators/rspec/view/templates/view_spec.rb
+- lib/generators/rspec/view/view_generator.rb
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
+- lib/rspec/rails/example/view_example_group.rb
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/transactional_database_support.rb