If Merb.env?(:test) we don't need ugly = true spread all over the place

akatz · Oct 2, 2008 · 5e90dcc · 5e90dcc
1 parent e51a805
commit 5e90dcc
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 11 deletions.
diff --git a/merb-action-args/spec/spec_helper.rb b/merb-action-args/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require "rubygems"

diff --git a/merb-assets/spec/spec_helper.rb b/merb-assets/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"

diff --git a/merb-builder/spec/spec_helper.rb b/merb-builder/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"

diff --git a/merb-cache/spec/spec_helper.rb b/merb-cache/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 # Deps

diff --git a/merb-gen/lib/generators/templates/application/merb_plugin/spec/spec_helper.rb b/merb-gen/lib/generators/templates/application/merb_plugin/spec/spec_helper.rb
@@ -1,2 +1 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
diff --git a/merb-gen/lib/generators/templates/application/merb_plugin/test/test_helper.rb b/merb-gen/lib/generators/templates/application/merb_plugin/test/test_helper.rb
@@ -1,2 +1 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
diff --git a/merb-gen/spec/spec_helper.rb b/merb-gen/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'

diff --git a/merb-haml/spec/spec_helper.rb b/merb-haml/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"

diff --git a/merb-helpers/spec/spec_helper.rb b/merb-helpers/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 require "rubygems"
 require "spec"
 require "merb-core"

diff --git a/merb-mailer/spec/spec_helper.rb b/merb-mailer/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"

diff --git a/merb-parts/spec/spec_helper.rb b/merb-parts/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-$TESTING=true
 require 'rubygems'
 require "merb-core"
 require File.join( File.dirname(__FILE__), "..", "lib", "merb-parts" )
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		$TESTING=true
		$:.push File.join(File.dirname(__FILE__), '..', 'lib')