aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-05-04 18:28:28 -0700
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-05-04 18:28:28 -0700
commitce147912eedee3eee1b93dc89f5de3a01e9ac2f1 (patch)
tree77cb79477a78da85264609dc2ae53b05aa791c17 /spec
parent92c2fd2a2fe029ffe2597134496bdab7f1ed4de6 (diff)
downloadrails-ce147912eedee3eee1b93dc89f5de3a01e9ac2f1.tar.gz
rails-ce147912eedee3eee1b93dc89f5de3a01e9ac2f1.tar.bz2
rails-ce147912eedee3eee1b93dc89f5de3a01e9ac2f1.zip
reorganization
Diffstat (limited to 'spec')
-rw-r--r--spec/arel/unit/relations/projection_spec.rb21
-rw-r--r--spec/arel/unit/relations/relation_spec.rb14
2 files changed, 12 insertions, 23 deletions
diff --git a/spec/arel/unit/relations/projection_spec.rb b/spec/arel/unit/relations/projection_spec.rb
index eedcf77952..0008858e08 100644
--- a/spec/arel/unit/relations/projection_spec.rb
+++ b/spec/arel/unit/relations/projection_spec.rb
@@ -70,21 +70,18 @@ module Arel
end
end
- describe Projection::Externalizable do
- describe '#aggregation?' do
- describe 'when the projections are attributes' do
- it 'returns false' do
- Projection.new(@relation, @attribute).should_not be_aggregation
- end
+ describe '#aggregation?' do
+ describe 'when the projections are attributes' do
+ it 'returns false' do
+ Projection.new(@relation, @attribute).should_not be_aggregation
end
-
- describe 'when the projections include an aggregation' do
- it "obtains" do
- Projection.new(@relation, @attribute.sum).should be_aggregation
- end
+ end
+
+ describe 'when the projections include an aggregation' do
+ it "obtains" do
+ Projection.new(@relation, @attribute.sum).should be_aggregation
end
end
-
end
end
end \ No newline at end of file
diff --git a/spec/arel/unit/relations/relation_spec.rb b/spec/arel/unit/relations/relation_spec.rb
index 3b8be55c7d..d9ae8e0742 100644
--- a/spec/arel/unit/relations/relation_spec.rb
+++ b/spec/arel/unit/relations/relation_spec.rb
@@ -23,16 +23,8 @@ module Arel
end
end
end
-
- describe Relation::Externalizable do
- describe '#aggregation?' do
- it "returns false" do
- @relation.should_not be_aggregation
- end
- end
- end
-
- describe Relation::Operations do
+
+ describe Relation::Operable do
describe 'joins' do
before do
@predicate = @relation[:id].eq(@relation[:id])
@@ -154,7 +146,7 @@ module Arel
end
end
- describe Relation::Operations::Writes do
+ describe Relation::Operable::Writable do
describe '#delete' do
it 'manufactures a deletion relation' do
Session.start do