Merge branch 'remove-deprecated'

4 files changed, 13 insertions, 31 deletions

diff --git a/test/helper.rb b/test/helper.rb
index f13596f9ec..1292c09a08 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -4,7 +4,7 @@ require 'fileutils'
 require 'arel'
 
 require 'support/fake_record'
-Arel::Table.engine = Arel::Sql::Engine.new(FakeRecord::Base.new)
+Arel::Table.engine = FakeRecord::Base.new
 
 class Object
   def must_be_like other
diff --git a/test/nodes/test_count.rb b/test/nodes/test_count.rb
index 88d2a694c8..a9a329420e 100644
--- a/test/nodes/test_count.rb
+++ b/test/nodes/test_count.rb
@@ -1,12 +1,6 @@
 require 'helper'
 
 describe Arel::Nodes::Count do
-  describe 'backwards compatibility' do
-    it 'must be an expression' do
-      Arel::Nodes::Count.new('foo').must_be_kind_of Arel::Expression
-    end
-  end
-
   describe "as" do
     it 'should alias the count' do
       table = Arel::Table.new :users
diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb
index 6d0407c65c..cf8903a05b 100644
--- a/test/test_select_manager.rb
+++ b/test/test_select_manager.rb
@@ -33,7 +33,7 @@ module Arel
         it 'accepts symbols' do
           table   = Table.new :users
           manager = Arel::SelectManager.new Table.engine
-          manager.project SqlLiteral.new '*'
+          manager.project Nodes::SqlLiteral.new '*'
           manager.from table
           manager.order :foo
           manager.to_sql.must_be_like %{ SELECT * FROM "users" ORDER BY foo }
@@ -224,7 +224,7 @@ module Arel
       it 'should create an exists clause' do
         table = Table.new(:users)
         manager = Arel::SelectManager.new Table.engine, table
-        manager.project SqlLiteral.new '*'
+        manager.project Nodes::SqlLiteral.new '*'
         m2 = Arel::SelectManager.new(manager.engine)
         m2.project manager.exists
         m2.to_sql.must_be_like %{ SELECT EXISTS (#{manager.to_sql}) }
@@ -233,7 +233,7 @@ module Arel
       it 'can be aliased' do
         table = Table.new(:users)
         manager = Arel::SelectManager.new Table.engine, table
-        manager.project SqlLiteral.new '*'
+        manager.project Nodes::SqlLiteral.new '*'
         m2 = Arel::SelectManager.new(manager.engine)
         m2.project manager.exists.as('foo')
         m2.to_sql.must_be_like %{ SELECT EXISTS (#{manager.to_sql}) AS foo }
@@ -413,7 +413,7 @@ module Arel
       it 'generates order clauses' do
         table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
-        manager.project SqlLiteral.new '*'
+        manager.project Nodes::SqlLiteral.new '*'
         manager.from table
         manager.order table[:id]
         manager.to_sql.must_be_like %{
@@ -425,7 +425,7 @@ module Arel
       it 'takes *args' do
         table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
-        manager.project SqlLiteral.new '*'
+        manager.project Nodes::SqlLiteral.new '*'
         manager.from table
         manager.order table[:id], table[:name]
         manager.to_sql.must_be_like %{
@@ -442,25 +442,13 @@ module Arel
       it 'has order attributes' do
         table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
-        manager.project SqlLiteral.new '*'
+        manager.project Nodes::SqlLiteral.new '*'
         manager.from table
         manager.order table[:id].desc
         manager.to_sql.must_be_like %{
           SELECT * FROM "users" ORDER BY "users"."id" DESC
         }
       end
-
-      it 'has order attributes for expressions' do
-        table   = Table.new :users
-        manager = Arel::SelectManager.new Table.engine
-        manager.project SqlLiteral.new '*'
-        manager.from table
-        manager.order table[:id].count.desc
-        manager.to_sql.must_be_like %{
-          SELECT * FROM "users" ORDER BY COUNT("users"."id") DESC
-        }
-      end
-
     end
 
     describe 'on' do
@@ -873,7 +861,7 @@ module Arel
         manager = Arel::SelectManager.new Table.engine
         manager.from table
         manager.take 1
-        stmt = manager.compile_update(SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
+        stmt = manager.compile_update(Nodes::SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
         stmt.key = table['id']
 
         stmt.to_sql.must_be_like %{
@@ -887,7 +875,7 @@ module Arel
         manager = Arel::SelectManager.new Table.engine
         manager.from table
         manager.order :foo
-        stmt = manager.compile_update(SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
+        stmt = manager.compile_update(Nodes::SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
         stmt.key = table['id']
 
         stmt.to_sql.must_be_like %{
@@ -900,7 +888,7 @@ module Arel
         table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
         manager.from table
-        stmt = manager.compile_update(SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
+        stmt = manager.compile_update(Nodes::SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
 
         stmt.to_sql.must_be_like %{ UPDATE "users" SET foo = bar }
       end
diff --git a/test/test_table.rb b/test/test_table.rb
index 5db8cdd6c0..2c1683b4ce 100644
--- a/test/test_table.rb
+++ b/test/test_table.rb
@@ -130,19 +130,19 @@ module Arel
     describe 'take' do
       it "should add a limit" do
         manager = @relation.take 1
-        manager.project SqlLiteral.new '*'
+        manager.project Nodes::SqlLiteral.new '*'
         manager.to_sql.must_be_like %{ SELECT * FROM "users" LIMIT 1 }
       end
     end
 
     describe 'project' do
       it 'can project' do
-        manager = @relation.project SqlLiteral.new '*'
+        manager = @relation.project Nodes::SqlLiteral.new '*'
         manager.to_sql.must_be_like %{ SELECT * FROM "users" }
       end
 
       it 'takes multiple parameters' do
-        manager = @relation.project SqlLiteral.new('*'), SqlLiteral.new('*')
+        manager = @relation.project Nodes::SqlLiteral.new('*'), Nodes::SqlLiteral.new('*')
         manager.to_sql.must_be_like %{ SELECT *, * FROM "users" }
       end
     end