From: Simon Harris <sharris(a)redhat.com>
---
src/spec/models/pool_family_spec.rb | 8 ++++----
src/spec/models/pool_spec.rb | 4 ++--
src/spec/models/role_spec.rb | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/spec/models/pool_family_spec.rb b/src/spec/models/pool_family_spec.rb
index c298668..589b2e9 100644
--- a/src/spec/models/pool_family_spec.rb
+++ b/src/spec/models/pool_family_spec.rb
@@ -33,16 +33,16 @@ describe PoolFamily do
it "should not be valid if name is too long" do
@pool_family.name = ('a' * 256)
- @pool_family.valid?.should be_false
+ @pool_family.should_not be_valid
@pool_family.errors[:name].should_not be_nil
- @pool_family.errors[:name].should =~ /^is too long.*/
+ @pool_family.errors[:name].grep(/^is too long.*/).should_not be_empty
end
it "should not be valid if name contains special characters" do
@pool_family.name = '.'
- @pool_family.valid?.should be_false
+ @pool_family.should_not be_valid
@pool_family.errors[:name].should_not be_nil
- @pool_family.errors[:name].should =~ /^must only contain.*/
+ @pool_family.errors[:name].grep(/^must only contain.*/).should_not be_empty
end
it "should require quota to be set" do
diff --git a/src/spec/models/pool_spec.rb b/src/spec/models/pool_spec.rb
index adedc16..a9df7ef 100644
--- a/src/spec/models/pool_spec.rb
+++ b/src/spec/models/pool_spec.rb
@@ -17,9 +17,9 @@ describe Pool do
it "should not be valid if name is too long" do
u = FactoryGirl.create(:pool)
u.name = ('a' * 256)
- u.valid?.should be_false
+ u.should_not be_valid
u.errors[:name].should_not be_nil
- u.errors[:name].should =~ /^is too long.*/
+ u.errors[:name].grep(/^is too long.*/).should_not be_empty
end
it "should not be destroyable when it has running instances" do
diff --git a/src/spec/models/role_spec.rb b/src/spec/models/role_spec.rb
index 8adc580..956fbda 100644
--- a/src/spec/models/role_spec.rb
+++ b/src/spec/models/role_spec.rb
@@ -5,8 +5,8 @@ describe Role do
it "should not be valid if name is too long" do
u = FactoryGirl.create(:role)
u.name = ('a' * 256)
- u.valid?.should be_false
+ u.should_not be_valid
u.errors[:name].should_not be_nil
- u.errors[:name].should =~ /^is too long.*/
+ u.errors[:name].grep(/^is too long.*/).should_not be_empty
end
end
--
1.7.4.4
Show replies by date