aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-02-23 16:12:16 -0800
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-02-23 16:12:16 -0800
commitf6d9b74ad0c9f061f9bca71d24132a0a7b066291 (patch)
tree2583ff107d147a832c1b2f1be63446029ec5b5dc /spec
parentae217d5816c766443c6e6737d04073f40614b564 (diff)
downloadrails-f6d9b74ad0c9f061f9bca71d24132a0a7b066291.tar.gz
rails-f6d9b74ad0c9f061f9bca71d24132a0a7b066291.tar.bz2
rails-f6d9b74ad0c9f061f9bca71d24132a0a7b066291.zip
organizing tests into unit/integration
Diffstat (limited to 'spec')
-rw-r--r--spec/active_relation/unit/predicates/binary_spec.rb (renamed from spec/active_relation/predicates/binary_spec.rb)2
-rw-r--r--spec/active_relation/unit/predicates/equality_spec.rb (renamed from spec/active_relation/predicates/equality_spec.rb)2
-rw-r--r--spec/active_relation/unit/predicates/relation_inclusion_spec.rb (renamed from spec/active_relation/predicates/relation_inclusion_spec.rb)2
-rw-r--r--spec/active_relation/unit/primitives/attribute_spec.rb (renamed from spec/active_relation/primitives/attribute_spec.rb)2
-rw-r--r--spec/active_relation/unit/primitives/expression_spec.rb (renamed from spec/active_relation/primitives/expression_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/alias_spec.rb (renamed from spec/active_relation/relations/alias_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/compound_spec.rb (renamed from spec/active_relation/relations/compound_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/deletion_spec.rb (renamed from spec/active_relation/relations/deletion_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/insertion_spec.rb (renamed from spec/active_relation/relations/insertion_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/join_spec.rb (renamed from spec/active_relation/relations/join_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/order_spec.rb (renamed from spec/active_relation/relations/order_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/projection_spec.rb (renamed from spec/active_relation/relations/projection_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/range_spec.rb (renamed from spec/active_relation/relations/range_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/relation_spec.rb (renamed from spec/active_relation/relations/relation_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/rename_spec.rb (renamed from spec/active_relation/relations/rename_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/selection_spec.rb (renamed from spec/active_relation/relations/selection_spec.rb)2
-rw-r--r--spec/active_relation/unit/relations/table_spec.rb (renamed from spec/active_relation/relations/table_spec.rb)2
17 files changed, 17 insertions, 17 deletions
diff --git a/spec/active_relation/predicates/binary_spec.rb b/spec/active_relation/unit/predicates/binary_spec.rb
index 4f37a6aa7e..44c1a1a7a0 100644
--- a/spec/active_relation/predicates/binary_spec.rb
+++ b/spec/active_relation/unit/predicates/binary_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Binary do
diff --git a/spec/active_relation/predicates/equality_spec.rb b/spec/active_relation/unit/predicates/equality_spec.rb
index f947bc6fe7..fd30846c70 100644
--- a/spec/active_relation/predicates/equality_spec.rb
+++ b/spec/active_relation/unit/predicates/equality_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Equality do
diff --git a/spec/active_relation/predicates/relation_inclusion_spec.rb b/spec/active_relation/unit/predicates/relation_inclusion_spec.rb
index 05039028ee..799be23085 100644
--- a/spec/active_relation/predicates/relation_inclusion_spec.rb
+++ b/spec/active_relation/unit/predicates/relation_inclusion_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe RelationInclusion do
diff --git a/spec/active_relation/primitives/attribute_spec.rb b/spec/active_relation/unit/primitives/attribute_spec.rb
index a931ea2150..e5a3792d85 100644
--- a/spec/active_relation/primitives/attribute_spec.rb
+++ b/spec/active_relation/unit/primitives/attribute_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Attribute do
diff --git a/spec/active_relation/primitives/expression_spec.rb b/spec/active_relation/unit/primitives/expression_spec.rb
index 753f189e82..5506f52b86 100644
--- a/spec/active_relation/primitives/expression_spec.rb
+++ b/spec/active_relation/unit/primitives/expression_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Expression do
diff --git a/spec/active_relation/relations/alias_spec.rb b/spec/active_relation/unit/relations/alias_spec.rb
index 6c9724bb3d..4a2144db82 100644
--- a/spec/active_relation/relations/alias_spec.rb
+++ b/spec/active_relation/unit/relations/alias_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Alias do
diff --git a/spec/active_relation/relations/compound_spec.rb b/spec/active_relation/unit/relations/compound_spec.rb
index b0f122ca97..03de27fb05 100644
--- a/spec/active_relation/relations/compound_spec.rb
+++ b/spec/active_relation/unit/relations/compound_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Compound do
diff --git a/spec/active_relation/relations/deletion_spec.rb b/spec/active_relation/unit/relations/deletion_spec.rb
index 64b75d0600..1a536e7aed 100644
--- a/spec/active_relation/relations/deletion_spec.rb
+++ b/spec/active_relation/unit/relations/deletion_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Deletion do
diff --git a/spec/active_relation/relations/insertion_spec.rb b/spec/active_relation/unit/relations/insertion_spec.rb
index f16ab8cc23..a0427bc74f 100644
--- a/spec/active_relation/relations/insertion_spec.rb
+++ b/spec/active_relation/unit/relations/insertion_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Insertion do
diff --git a/spec/active_relation/relations/join_spec.rb b/spec/active_relation/unit/relations/join_spec.rb
index 77c6baeac4..bc55a72e55 100644
--- a/spec/active_relation/relations/join_spec.rb
+++ b/spec/active_relation/unit/relations/join_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Join do
diff --git a/spec/active_relation/relations/order_spec.rb b/spec/active_relation/unit/relations/order_spec.rb
index 32a54e72fa..15f08d70ee 100644
--- a/spec/active_relation/relations/order_spec.rb
+++ b/spec/active_relation/unit/relations/order_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Order do
diff --git a/spec/active_relation/relations/projection_spec.rb b/spec/active_relation/unit/relations/projection_spec.rb
index 9f6b6797ce..75a4672642 100644
--- a/spec/active_relation/relations/projection_spec.rb
+++ b/spec/active_relation/unit/relations/projection_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Projection do
diff --git a/spec/active_relation/relations/range_spec.rb b/spec/active_relation/unit/relations/range_spec.rb
index f27b6106e8..501a8d3641 100644
--- a/spec/active_relation/relations/range_spec.rb
+++ b/spec/active_relation/unit/relations/range_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Range do
diff --git a/spec/active_relation/relations/relation_spec.rb b/spec/active_relation/unit/relations/relation_spec.rb
index a25dc4b1db..a80df928c7 100644
--- a/spec/active_relation/relations/relation_spec.rb
+++ b/spec/active_relation/unit/relations/relation_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Relation do
diff --git a/spec/active_relation/relations/rename_spec.rb b/spec/active_relation/unit/relations/rename_spec.rb
index 6c6bd450f5..33a89e6a49 100644
--- a/spec/active_relation/relations/rename_spec.rb
+++ b/spec/active_relation/unit/relations/rename_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Rename do
diff --git a/spec/active_relation/relations/selection_spec.rb b/spec/active_relation/unit/relations/selection_spec.rb
index b6db6bfd4a..afe002186e 100644
--- a/spec/active_relation/relations/selection_spec.rb
+++ b/spec/active_relation/unit/relations/selection_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Selection do
diff --git a/spec/active_relation/relations/table_spec.rb b/spec/active_relation/unit/relations/table_spec.rb
index a7b5b5f69b..3b02f80701 100644
--- a/spec/active_relation/relations/table_spec.rb
+++ b/spec/active_relation/unit/relations/table_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
module ActiveRelation
describe Table do