Avoid multiple returns

[rails.git] / test / models / user_test.rb

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 387c75ec9ebd2e3953f0ae01fa8a9389c824f72e..0e618cd22c86ec3058c0f699c6dfc1730a307bfc 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 require "test_helper"
 
 class UserTest < ActiveSupport::TestCase
 require "test_helper"
 
 class UserTest < ActiveSupport::TestCase


@@ -6,14 +5,14 @@ class UserTest < ActiveSupport::TestCase
 
   def test_invalid_with_empty_attributes
     user = User.new
 
   def test_invalid_with_empty_attributes
     user = User.new

-    assert !user.valid?
+    assert_not user.valid?

     assert user.errors[:email].any?
     assert user.errors[:pass_crypt].any?
     assert user.errors[:display_name].any?
     assert user.errors[:email].any?
     assert user.errors[:email].any?
     assert user.errors[:pass_crypt].any?
     assert user.errors[:display_name].any?
     assert user.errors[:email].any?

-    assert !user.errors[:home_lat].any?
-    assert !user.errors[:home_lon].any?
-    assert !user.errors[:home_zoom].any?
+    assert user.errors[:home_lat].none?
+    assert user.errors[:home_lon].none?
+    assert user.errors[:home_zoom].none?

   end
 
   def test_unique_email
   end
 
   def test_unique_email


@@ -26,7 +25,7 @@ class UserTest < ActiveSupport::TestCase
       :data_public => 1,
       :description => "desc"
     )
       :data_public => 1,
       :description => "desc"
     )

-    assert !new_user.save
+    assert_not new_user.save

     assert new_user.errors[:email].include?("has already been taken")
   end
 
     assert new_user.errors[:email].include?("has already been taken")
   end
 


@@ -40,15 +39,15 @@ class UserTest < ActiveSupport::TestCase
       :data_public => 1,
       :description => "desc"
     )
       :data_public => 1,
       :description => "desc"
     )

-    assert !new_user.save
+    assert_not new_user.save

     assert new_user.errors[:display_name].include?("has already been taken")
   end
 
   def test_email_valid
     assert new_user.errors[:display_name].include?("has already been taken")
   end
 
   def test_email_valid

-    ok = %w(a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng
-            test_local@openstreetmap.org test-local@example.com)
-    bad = %w(hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します
-             輕觸搖晃的遊戲@ah.com も対応します@s.name)
+    ok = %w[a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng
+            test_local@openstreetmap.org test-local@example.com]
+    bad = %w[hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します
+             輕觸搖晃的遊戲@ah.com も対応します@s.name]

 
     ok.each do |name|
       user = build(:user)
 
     ok.each do |name|
       user = build(:user)


@@ -68,14 +67,14 @@ class UserTest < ActiveSupport::TestCase
     user.display_name = "123"
     assert user.valid?, " should allow nil display name"
     user.display_name = "12"
     user.display_name = "123"
     assert user.valid?, " should allow nil display name"
     user.display_name = "12"

-    assert !user.valid?, "should not allow 2 char name"
+    assert_not user.valid?, "should not allow 2 char name"

     user.display_name = ""
     user.display_name = ""

-    assert !user.valid?
+    assert_not user.valid?

     user.display_name = nil
     # Don't understand why it isn't allowing a nil value,
     # when the validates statements specifically allow it
     # It appears the database does not allow null values
     user.display_name = nil
     # Don't understand why it isn't allowing a nil value,
     # when the validates statements specifically allow it
     # It appears the database does not allow null values

-    assert !user.valid?
+    assert_not user.valid?

   end
 
   def test_display_name_valid
   end
 
   def test_display_name_valid


@@ -100,7 +99,7 @@ class UserTest < ActiveSupport::TestCase
     bad.each do |display_name|
       user = build(:user)
       user.display_name = display_name
     bad.each do |display_name|
       user = build(:user)
       user.display_name = display_name

-      assert !user.valid?, "#{display_name} is valid when it shouldn't be"
+      assert_not user.valid?, "#{display_name} is valid when it shouldn't be"

     end
   end
 
     end
   end
 


@@ -111,11 +110,11 @@ class UserTest < ActiveSupport::TestCase
     create(:friend, :befriender => alice, :befriendee => bob)
 
     assert alice.is_friends_with?(bob)
     create(:friend, :befriender => alice, :befriendee => bob)
 
     assert alice.is_friends_with?(bob)

-    assert !alice.is_friends_with?(charlie)
-    assert !bob.is_friends_with?(alice)
-    assert !bob.is_friends_with?(charlie)
-    assert !charlie.is_friends_with?(bob)
-    assert !charlie.is_friends_with?(alice)
+    assert_not alice.is_friends_with?(charlie)
+    assert_not bob.is_friends_with?(alice)
+    assert_not bob.is_friends_with?(charlie)
+    assert_not charlie.is_friends_with?(bob)
+    assert_not charlie.is_friends_with?(alice)

   end
 
   def test_users_nearby
   end
 
   def test_users_nearby


@@ -217,13 +216,13 @@ class UserTest < ActiveSupport::TestCase
 
     user = create(:user, :languages => ["en"])
     assert_equal ["en"], user.languages
 
     user = create(:user, :languages => ["en"])
     assert_equal ["en"], user.languages

-    user.languages = %w(de fr en)
-    assert_equal %w(de fr en), user.languages
-    user.languages = %w(fr de sl)
+    user.languages = %w[de fr en]
+    assert_equal %w[de fr en], user.languages
+    user.languages = %w[fr de sl]

     assert_equal "de", user.preferred_language
     assert_equal "de", user.preferred_language

-    assert_equal %w(fr de sl), user.preferred_languages.map(&:to_s)
-    user = create(:user, :languages => %w(en de))
-    assert_equal %w(en de), user.languages
+    assert_equal %w[fr de sl], user.preferred_languages.map(&:to_s)
+    user = create(:user, :languages => %w[en de])
+    assert_equal %w[en de], user.languages

   end
 
   def test_visible?
   end
 
   def test_visible?