From 976999cb980eb47ac5f297de043e2ed55248c2a5 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 9 Nov 2009 19:24:40 -0500 Subject: Ruby 1.9: the constants must be qualified --- spec/arel/engines/sql/unit/predicates/binary_spec.rb | 2 +- spec/arel/engines/sql/unit/predicates/equality_spec.rb | 4 ++-- spec/arel/engines/sql/unit/predicates/in_spec.rb | 2 +- spec/arel/engines/sql/unit/predicates/predicates_spec.rb | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'spec/arel/engines') diff --git a/spec/arel/engines/sql/unit/predicates/binary_spec.rb b/spec/arel/engines/sql/unit/predicates/binary_spec.rb index 23bce54792..08f3310f8e 100644 --- a/spec/arel/engines/sql/unit/predicates/binary_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/binary_spec.rb @@ -10,7 +10,7 @@ module Arel end before do - @relation = Table.new(:users) + @relation = Arel::Table.new(:users) @attribute1 = @relation[:id] @attribute2 = @relation[:name] end diff --git a/spec/arel/engines/sql/unit/predicates/equality_spec.rb b/spec/arel/engines/sql/unit/predicates/equality_spec.rb index 4004bb5881..7a5cb42c85 100644 --- a/spec/arel/engines/sql/unit/predicates/equality_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/equality_spec.rb @@ -4,8 +4,8 @@ module Arel module Predicates describe Equality do before do - @relation1 = Table.new(:users) - @relation2 = Table.new(:photos) + @relation1 = Arel::Table.new(:users) + @relation2 = Arel::Table.new(:photos) @attribute1 = @relation1[:id] @attribute2 = @relation2[:user_id] end diff --git a/spec/arel/engines/sql/unit/predicates/in_spec.rb b/spec/arel/engines/sql/unit/predicates/in_spec.rb index bb00733e60..691abcb2d2 100644 --- a/spec/arel/engines/sql/unit/predicates/in_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/in_spec.rb @@ -4,7 +4,7 @@ module Arel module Predicates describe In do before do - @relation = Table.new(:users) + @relation = Arel::Table.new(:users) @attribute = @relation[:id] end diff --git a/spec/arel/engines/sql/unit/predicates/predicates_spec.rb b/spec/arel/engines/sql/unit/predicates/predicates_spec.rb index 7d53351546..81c348357c 100644 --- a/spec/arel/engines/sql/unit/predicates/predicates_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/predicates_spec.rb @@ -4,11 +4,11 @@ module Arel module Predicates describe Predicate do before do - @relation = Table.new(:users) + @relation = Arel::Table.new(:users) @attribute1 = @relation[:id] @attribute2 = @relation[:name] - @operand1 = Equality.new(@attribute1, 1) - @operand2 = Equality.new(@attribute2, "name") + @operand1 = Arel::Predicates::Equality.new(@attribute1, 1) + @operand2 = Arel::Predicates::Equality.new(@attribute2, "name") end describe "when being combined with another predicate with AND logic" do -- cgit v1.2.3 From 130188e67ce76e4ced60dc0331d2ac5bba6cdb74 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 9 Nov 2009 19:31:53 -0500 Subject: Switch from rr to RSpec mocks. rr has issues on 1.9.2pre --- spec/arel/engines/sql/unit/relations/table_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/arel/engines') diff --git a/spec/arel/engines/sql/unit/relations/table_spec.rb b/spec/arel/engines/sql/unit/relations/table_spec.rb index 26b9364929..92e4549028 100644 --- a/spec/arel/engines/sql/unit/relations/table_spec.rb +++ b/spec/arel/engines/sql/unit/relations/table_spec.rb @@ -42,8 +42,8 @@ module Arel describe '#reset' do it "reloads columns from the database" do - lambda { stub(@relation.engine).columns { [] } }.should_not change { @relation.attributes } - lambda { @relation.reset }.should change { @relation.attributes } + lambda { @relation.engine.stub!(:columns => []) }.should_not change { @relation.attributes } + lambda { @relation.reset }.should change { @relation.attributes } end end end -- cgit v1.2.3