Remove ActiveRelation sub-modules and refactor specs

1 files changed, 23 insertions, 22 deletions

diff --git a/spec/active_relation/relations/range_spec.rb b/spec/active_relation/relations/range_spec.rb
index d4107259aa..f417626fed 100644
--- a/spec/active_relation/relations/range_spec.rb
+++ b/spec/active_relation/relations/range_spec.rb
@@ -1,30 +1,31 @@
 require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 
-describe ActiveRelation::Relations::Range do
-  before do
-    @relation1 = ActiveRelation::Relations::Table.new(:foo)
-    @relation2 = ActiveRelation::Relations::Table.new(:bar)
-    @range1 = 1..2
-    @range2 = 4..9
-  end
+module ActiveRelation
+  describe Range do
+    before do
+      @relation1 = Table.new(:foo)
+      @relation2 = Table.new(:bar)
+      @range1 = 1..2
+      @range2 = 4..9
+    end
 
-  describe '#qualify' do
-    it "distributes over the relation and attributes" do
-      pending
+    describe '#qualify' do
+      it "distributes over the relation and attributes" do
+        pending
+      end
     end
-  end
   
-  describe '#to_sql' do
-    it "manufactures sql with limit and offset" do
-      range_size = @range2.last - @range2.first + 1
-      range_start = @range2.first
-      ActiveRelation::Relations::Range.new(@relation1, @range2).to_s.should be_like("""
-        SELECT `foo`.`name`, `foo`.`id`
-        FROM `foo`
-        LIMIT #{range_size}
-        OFFSET #{range_start}
-      """)
+    describe '#to_sql' do
+      it "manufactures sql with limit and offset" do
+        range_size = @range2.last - @range2.first + 1
+        range_start = @range2.first
+        Range.new(@relation1, @range2).to_s.should be_like("""
+          SELECT `foo`.`name`, `foo`.`id`
+          FROM `foo`
+          LIMIT #{range_size}
+          OFFSET #{range_start}
+        """)
+      end
     end
   end
-  
 end
\ No newline at end of file