aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/arel/unit/relations/skip_spec.rb2
-rw-r--r--spec/arel/unit/relations/table_spec.rb4
-rw-r--r--spec/arel/unit/relations/take_spec.rb2
-rw-r--r--spec/spec_helper.rb2
4 files changed, 5 insertions, 5 deletions
diff --git a/spec/arel/unit/relations/skip_spec.rb b/spec/arel/unit/relations/skip_spec.rb
index 0653d795b1..2c8f6ccadb 100644
--- a/spec/arel/unit/relations/skip_spec.rb
+++ b/spec/arel/unit/relations/skip_spec.rb
@@ -9,7 +9,7 @@ module Arel
describe '#to_sql' do
it "manufactures sql with limit and offset" do
- sql = Skip.new(@relation, @skipped).to_s
+ sql = Skip.new(@relation, @skipped).to_sql
adapter_is :mysql do
sql.should be_like(%Q{
diff --git a/spec/arel/unit/relations/table_spec.rb b/spec/arel/unit/relations/table_spec.rb
index 08486c7b6c..211e6921f8 100644
--- a/spec/arel/unit/relations/table_spec.rb
+++ b/spec/arel/unit/relations/table_spec.rb
@@ -87,12 +87,12 @@ module Arel
describe '#engine' do
it "defaults to global engine" do
- Table.engine = engine = Engine.new
+ Table.engine = engine = Sql::Engine.new
Table.new(:users).engine.should == engine
end
it "can be specified" do
- Table.new(:users, engine = Engine.new).engine.should == engine
+ Table.new(:users, engine = Sql::Engine.new).engine.should == engine
end
end
end
diff --git a/spec/arel/unit/relations/take_spec.rb b/spec/arel/unit/relations/take_spec.rb
index 911b84e01e..d6442fc9d1 100644
--- a/spec/arel/unit/relations/take_spec.rb
+++ b/spec/arel/unit/relations/take_spec.rb
@@ -9,7 +9,7 @@ module Arel
describe '#to_sql' do
it "manufactures sql with limit and offset" do
- sql = Take.new(@relation, @taken).to_s
+ sql = Take.new(@relation, @taken).to_sql
adapter_is :mysql do
sql.should be_like(%Q{
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8d515d66f1..6a9a2ef23c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -30,6 +30,6 @@ Spec::Runner.configure do |config|
config.include AdapterGuards
config.mock_with :rr
config.before do
- Arel::Table.engine = Arel::Engine.new(ActiveRecord::Base)
+ Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base)
end
end