From 25083947e3f3ca8cf19380366bd3e186261b17f3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 12 Aug 2010 14:24:11 -0700
Subject: stripping the spec helper

---
 spec/algebra/unit/relations/table_spec.rb | 38 -------------------------------
 spec/arel/table_spec.rb                   | 38 +++++++++++++++++++++++++++++++
 spec/spec_helper.rb                       |  9 --------
 3 files changed, 38 insertions(+), 47 deletions(-)
 delete mode 100644 spec/algebra/unit/relations/table_spec.rb
 create mode 100644 spec/arel/table_spec.rb

(limited to 'spec')

diff --git a/spec/algebra/unit/relations/table_spec.rb b/spec/algebra/unit/relations/table_spec.rb
deleted file mode 100644
index d1c7cc46ba..0000000000
--- a/spec/algebra/unit/relations/table_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-module Arel
-  describe Table do
-    before do
-      @relation = Table.new(:users)
-    end
-
-    describe '[]' do
-      describe 'when given a', Symbol do
-        it "manufactures an attribute if the symbol names an attribute within the relation" do
-          check @relation[:id].should == Attributes::Integer.new(@relation, :id)
-        end
-      end
-
-      describe 'when given an', Attribute do
-        it "returns the attribute if the attribute is within the relation" do
-          @relation[@relation[:id]].should == @relation[:id]
-        end
-
-        it "returns nil if the attribtue is not within the relation" do
-          another_relation = Table.new(:photos)
-          @relation[another_relation[:id]].should be_nil
-        end
-      end
-
-      describe 'when given an', Expression do
-        before do
-          @expression = @relation[:id].count
-        end
-
-        it "returns the Expression if the Expression is within the relation" do
-          @relation[@expression].should be_nil
-        end
-      end
-    end
-  end
-end
diff --git a/spec/arel/table_spec.rb b/spec/arel/table_spec.rb
new file mode 100644
index 0000000000..d1c7cc46ba
--- /dev/null
+++ b/spec/arel/table_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Arel
+  describe Table do
+    before do
+      @relation = Table.new(:users)
+    end
+
+    describe '[]' do
+      describe 'when given a', Symbol do
+        it "manufactures an attribute if the symbol names an attribute within the relation" do
+          check @relation[:id].should == Attributes::Integer.new(@relation, :id)
+        end
+      end
+
+      describe 'when given an', Attribute do
+        it "returns the attribute if the attribute is within the relation" do
+          @relation[@relation[:id]].should == @relation[:id]
+        end
+
+        it "returns nil if the attribtue is not within the relation" do
+          another_relation = Table.new(:photos)
+          @relation[another_relation[:id]].should be_nil
+        end
+      end
+
+      describe 'when given an', Expression do
+        before do
+          @expression = @relation[:id].count
+        end
+
+        it "returns the Expression if the Expression is within the relation" do
+          @relation[@expression].should be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e92129d723..5d3f5a2950 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'spec'
-require 'pp'
 require 'fileutils'
 require 'arel'
 
@@ -8,15 +7,7 @@ if adapter = ENV['ADAPTER']
   require "support/connections/#{adapter}_connection.rb"
 end
 
-Dir["spec/{support,shared}/*.rb"].each do |file|
-  require file
-end
-
 Spec::Runner.configure do |config|
-  config.include Matchers
-  config.include AdapterGuards
-  config.include Check
-
   if defined?(ActiveRecord::Base)
     tmp = File.expand_path('../../tmp', __FILE__)
 
-- 
cgit v1.2.3