Changeset 431

Timestamp:

08/27/07 17:24:39 (1 year ago)

Author:

iv..@gweezlebur.com

Message:

Add autotest discovery thingy for Merb source, and adjust some specs to

remove ordering issues (autotest and Rake run them in different orders)
Closes ticket #144

Files:

• trunk/Rakefile (modified) (1 diff)
• trunk/autotest (added)
• trunk/autotest/discover.rb (added)
• trunk/autotest/merbsource.rb (added)
• trunk/specs/merb/merb_controller_spec.rb (modified) (1 diff)
• trunk/specs/merb/merb_core_ext_spec.rb (modified) (1 diff)
• trunk/specs/merb/merb_dispatch_spec.rb (modified) (1 diff)
• trunk/specs/merb/merb_render_spec.rb (modified) (1 diff)
• trunk/specs/merb/merb_view_context_spec.rb (modified) (1 diff)
• trunk/specs/spec_helper.rb (modified) (2 diffs)

trunk/Rakefile

@@ -119 +119 @@
-Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.libs = ['lib', 'server/lib' ]
-  t.spec_files = Dir['specs/**/*_spec.rb'].sort
-end

trunk/specs/merb/merb_controller_spec.rb

@@ -1 @@
-require 'merb/core_ext'
-require File.dirname(__FILE__) + '/../spec_helper'
-

trunk/specs/merb/merb_core_ext_spec.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'lib/merb/core_ext'
-
-
-describe "A Numeric object" do

trunk/specs/merb/merb_dispatch_spec.rb

@@ -4 +4 @@
-$TESTING = true
-
-Merb::Server.allow_reloading=false
-Merb::Router.prepare do |r|
-  r.resource :icon
-  r.resources :posts, :member => {:stats => [:get, :put]}, 
-                      :collection => {:filter => [:get]} do |post|
-    post.resources :comments,  :member => {:stats => [:get, :put]}
-    post.resource :profile
-  end  
-  r.resources :as do |a|
-    a.resources :bs do |b|
-      b.resources :cs
-    end  
-  end
-  r.resources :tags, :namespace => '/admin'
-  r.default_routes
-end
-
-describe Merb::Dispatcher do
+  
+  before(:all) do
+    Merb::Server.allow_reloading=false
+    Merb::Router.prepare do |r|
+      r.resource :icon
+      r.resources :posts, :member => {:stats => [:get, :put]}, 
+                          :collection => {:filter => [:get]} do |post|
+        post.resources :comments,  :member => {:stats => [:get, :put]}
+        post.resource :profile
+      end  
+      r.resources :as do |a|
+        a.resources :bs do |b|
+          b.resources :cs
+        end  
+      end
+      r.resources :tags, :namespace => '/admin'
+      r.default_routes
+    end
+  end
-  
-  it "should not allow private and protected methods to be called" do

trunk/specs/merb/merb_render_spec.rb

@@ -19 +19 @@
-  end
-end  
-    
-
-class String
-  def clean
-    Hpricot(chomp).to_s
-  end
-end
-
-module Merb::Template

trunk/specs/merb/merb_view_context_spec.rb

@@ -2 +2 @@
-
-include Merb::ViewContextMixin
-
-class String
-  def clean
-    Hpricot(chomp).to_s
-  end
-end
-
-describe "View Context", "image tag" do

trunk/specs/spec_helper.rb

@@ -7 +7 @@
-require 'mocha'
-require 'hpricot'
-
+
+
+
-
-FIXTURES = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
@@ -38 +40 @@
-  include ::Merb::SessionMixin
-end
+
+class String
+  def clean
+    Hpricot(chomp).to_s
+  end
+end
+
-
-# -- Global custom matchers --