Fix some rubocop Naming/PredicateName warnings

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b8e782553aebb0159ceb2ef3a06abe29e57b3c77..95e3be8febbabc95db4766080f68b8722b857ec1 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -123,12 +123,7 @@ Naming/AccessorMethodName:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:

-    - 'app/models/changeset.rb'
-    - 'app/models/old_node.rb'
-    - 'app/models/old_relation.rb'
-    - 'app/models/old_way.rb'

     - 'app/models/user.rb'
     - 'app/models/user.rb'

-    - 'lib/classic_pagination/pagination.rb'

 
 # Offense count: 5
 # Configuration parameters: Database, Include.
 
 # Offense count: 5
 # Configuration parameters: Database, Include.

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index a3a13b926e2482e7a9bf7f918228579e938a30d2..4cd33a92b6b3115b5b76a5e24f2cd5d69d5b2ee7 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -23,7 +23,7 @@ module Api
 
       # Find the changeset and check it is valid
       changeset = Changeset.find(id)
 
       # Find the changeset and check it is valid
       changeset = Changeset.find(id)

-      raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
+      raise OSM::APIChangesetNotYetClosedError, changeset if changeset.open?

 
       # Add a comment to the changeset
       comment = changeset.comments.create(:changeset => changeset,
 
       # Add a comment to the changeset
       comment = changeset.comments.create(:changeset => changeset,

diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb
index a08ce0b69882017a2719a3cf4309e0b910937e92..5bfce7f0b27d617ae3c93848290e93c45cc0c5bb 100644 (file)
--- a/app/controllers/friendships_controller.rb
+++ b/app/controllers/friendships_controller.rb
@@ -17,7 +17,7 @@ class FriendshipsController < ApplicationController
         friendship = Friendship.new
         friendship.befriender = current_user
         friendship.befriendee = @new_friend
         friendship = Friendship.new
         friendship.befriender = current_user
         friendship.befriendee = @new_friend

-        if current_user.is_friends_with?(@new_friend)
+        if current_user.friends_with?(@new_friend)

           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif current_user.friendships.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_friends_per_hour
           flash.now[:error] = t "friendships.make_friend.limit_exceeded"
           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif current_user.friendships.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_friends_per_hour
           flash.now[:error] = t "friendships.make_friend.limit_exceeded"


@@ -42,7 +42,7 @@ class FriendshipsController < ApplicationController
 
     if @friend
       if request.post?
 
     if @friend
       if request.post?

-        if current_user.is_friends_with?(@friend)
+        if current_user.friends_with?(@friend)

           Friendship.where(:befriender => current_user, :befriendee => @friend).delete_all
           flash[:notice] = t "friendships.remove_friend.success", :name => @friend.display_name
         else
           Friendship.where(:befriender => current_user, :befriendee => @friend).delete_all
           flash[:notice] = t "friendships.remove_friend.success", :name => @friend.display_name
         else

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 2659eaeeacf1ad6bf4c59f37a64da5c18bcc1703..f23a4e356e883bd51f0fb0d01cb52897a75fd0ab 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -65,7 +65,7 @@ class Changeset < ApplicationRecord
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at
   # least 6 controllers
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at
   # least 6 controllers

-  def is_open?
+  def open?

     # a changeset is open (that is, it will accept further changes) when
     # it has not yet run out of time and its capacity is small enough.
     # note that this may not be a hard limit - due to timing changes and
     # a changeset is open (that is, it will accept further changes) when
     # it has not yet run out of time and its capacity is small enough.
     # note that this may not be a hard limit - due to timing changes and


@@ -75,7 +75,7 @@ class Changeset < ApplicationRecord
   end
 
   def set_closed_time_now
   end
 
   def set_closed_time_now

-    self.closed_at = Time.now.utc if is_open?
+    self.closed_at = Time.now.utc if open?

   end
 
   def self.from_xml(xml, create: false)
   end
 
   def self.from_xml(xml, create: false)


@@ -120,7 +120,7 @@ class Changeset < ApplicationRecord
     @bbox ||= BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
   end
 
     @bbox ||= BoundingBox.new(min_lon, min_lat, max_lon, max_lat)
   end
 

-  def has_valid_bbox?
+  def bbox_valid?

     bbox.complete?
   end
 
     bbox.complete?
   end
 


@@ -187,7 +187,7 @@ class Changeset < ApplicationRecord
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
   def update_closed_at
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
   def update_closed_at

-    if is_open?
+    if open?

       self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
                          created_at + MAX_TIME_OPEN
                        else
       self.closed_at = if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
                          created_at + MAX_TIME_OPEN
                        else


@@ -205,7 +205,7 @@ class Changeset < ApplicationRecord
     raise OSM::APIUserChangesetMismatchError unless user.id == user_id
 
     # can't change a closed changeset
     raise OSM::APIUserChangesetMismatchError unless user.id == user_id
 
     # can't change a closed changeset

-    raise OSM::APIChangesetAlreadyClosedError, self unless is_open?
+    raise OSM::APIChangesetAlreadyClosedError, self unless open?

 
     # copy the other's tags
     self.tags = other.tags
 
     # copy the other's tags
     self.tags = other.tags

diff --git a/app/models/concerns/consistency_validations.rb b/app/models/concerns/consistency_validations.rb
index 8c89f61de9dfad633a31e65fa8356ad963d75817..101fd43103955a024eb57c676ff69a3f356bffc8 100644 (file)
--- a/app/models/concerns/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -16,7 +16,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError

-    elsif !new.changeset.is_open?
+    elsif !new.changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end


@@ -27,7 +27,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif new.changeset.user_id != user.id
       raise OSM::APIUserChangesetMismatchError

-    elsif !new.changeset.is_open?
+    elsif !new.changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, new.changeset
     end
   end


@@ -42,7 +42,7 @@ module ConsistencyValidations
       raise OSM::APIChangesetMissingError
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError
       raise OSM::APIChangesetMissingError
     elsif user.id != changeset.user_id
       raise OSM::APIUserChangesetMismatchError

-    elsif !changeset.is_open?
+    elsif !changeset.open?

       raise OSM::APIChangesetAlreadyClosedError, changeset
     end
   end
       raise OSM::APIChangesetAlreadyClosedError, changeset
     end
   end

diff --git a/app/models/concerns/redactable.rb b/app/models/concerns/redactable.rb
index ccf04907f28ff363cbc0f1d2e409076c3fd254a6..3a1ccf8b7d7494f6cdb2aa66f1dd559ac5e0f58e 100644 (file)
--- a/app/models/concerns/redactable.rb
+++ b/app/models/concerns/redactable.rb
@@ -11,7 +11,7 @@ module Redactable
 
   def redact!(redaction)
     # check that this version isn't the current version
 
   def redact!(redaction)
     # check that this version isn't the current version

-    raise OSM::APICannotRedactError if is_latest_version?
+    raise OSM::APICannotRedactError if latest_version?

 
     # make the change
     self.redaction = redaction
 
     # make the change
     self.redaction = redaction

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 4f5f074abf4b65600db82cc9de719bf736f30494..077039ac33c2e13c5e0e8f702f1d0d520e2fbd9c 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -103,7 +103,7 @@ class OldNode < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.

-  def is_latest_version?
+  def latest_version?

     current_node.version == version
   end
 end
     current_node.version == version
   end
 end

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 7f9a747e64c84ef99aee35d4f7117056a4ca7ce6..c36d645728a736907596920e0f8e604357069267 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -99,7 +99,7 @@ class OldRelation < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.

-  def is_latest_version?
+  def latest_version?

     current_relation.version == version
   end
 end
     current_relation.version == version
   end
 end

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index acf88ddcf61bc61fab89f925a40be62f7c48509f..fcff84ededfe0727120794994b5afc5cdaf04ff6 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -97,7 +97,7 @@ class OldWay < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.

-  def is_latest_version?
+  def latest_version?

     current_way.version == version
   end
 end
     current_way.version == version
   end
 end

diff --git a/app/models/user.rb b/app/models/user.rb
index e7e077a9b7f20f20420ead56ddf738b8e353e914..d357dc4f5017d3bc35f298c99bb0a1b1247568a3 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -258,7 +258,7 @@ class User < ApplicationRecord
     OSM::GreatCircle.new(home_lat, home_lon).distance(nearby_user.home_lat, nearby_user.home_lon)
   end
 
     OSM::GreatCircle.new(home_lat, home_lon).distance(nearby_user.home_lat, nearby_user.home_lon)
   end
 

-  def is_friends_with?(new_friend)
+  def friends_with?(new_friend)

     friendships.exists?(:befriendee => new_friend)
   end
 
     friendships.exists?(:befriendee => new_friend)
   end
 

diff --git a/app/views/api/changesets/_changeset.builder b/app/views/api/changesets/_changeset.builder
index 29218419677024863a3778347b503c1d32e87839..e0188a10e0914b5e9dd66fbd756c8a426df38e2f 100644 (file)
--- a/app/views/api/changesets/_changeset.builder
+++ b/app/views/api/changesets/_changeset.builder
@@ -3,11 +3,11 @@
 attrs = {
   "id" => changeset.id,
   "created_at" => changeset.created_at.xmlschema,
 attrs = {
   "id" => changeset.id,
   "created_at" => changeset.created_at.xmlschema,

-  "open" => changeset.is_open?,
+  "open" => changeset.open?,

   "comments_count" => changeset.comments.length,
   "changes_count" => changeset.num_changes
 }
   "comments_count" => changeset.comments.length,
   "changes_count" => changeset.num_changes
 }

-attrs["closed_at"] = changeset.closed_at.xmlschema unless changeset.is_open?
+attrs["closed_at"] = changeset.closed_at.xmlschema unless changeset.open?

 changeset.bbox.to_unscaled.add_bounds_to(attrs, "_") if changeset.bbox.complete?
 
 # user attributes
 changeset.bbox.to_unscaled.add_bounds_to(attrs, "_") if changeset.bbox.complete?
 
 # user attributes

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 6aa0f11fb12a6d3008f292efdfcbbd8a808f05b2..ca27862c8d58adab81b77b55dae2168327a1524f 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -73,7 +73,7 @@
   <% end %>
 
   <% if current_user %>
   <% end %>
 
   <% if current_user %>

-    <% unless @changeset.is_open? %>
+    <% unless @changeset.open? %>

       <form action="#" class="mb-3">
         <div class="form-group">
           <textarea class="form-control" name="text" cols="40" rows="5"></textarea>
       <form action="#" class="mb-3">
         <div class="form-group">
           <textarea class="form-control" name="text" cols="40" rows="5"></textarea>

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index 714cd14b57245b217ed1c29de72232071d48a561..a47a99d33a6b7f0260481d9e41df3573f4f68133 100644 (file)
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -1,6 +1,6 @@
 <% changeset_data = { :id => changeset.id }
 
 <% changeset_data = { :id => changeset.id }
 

-   if changeset.has_valid_bbox?
+   if changeset.bbox_valid?

      bbox = changeset.bbox.to_unscaled
      changeset_data[:bbox] = {
        :minlon => bbox.min_lon,
      bbox = changeset.bbox.to_unscaled
      changeset_data[:bbox] = {
        :minlon => bbox.min_lon,

diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index 7fd9b5dd21cf0a80b1117ee952c17887a7322193..3ab438b59f7dd14cd0839dfe11969639251bdf50 100644 (file)
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -72,7 +72,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
         end
       end
 
         end
       end
 

-      if changeset.has_valid_bbox?
+      if changeset.bbox_valid?

         bbox = changeset.bbox.to_unscaled
 
         # See http://georss.org/Encodings#Geometry
         bbox = changeset.bbox.to_unscaled
 
         # See http://georss.org/Encodings#Geometry

diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb
index 77363dbdb0a627b50f409eaa00fa69ab121b35af..7785c05523fb287cc3a239b430b65392b3c15953 100644 (file)
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -37,7 +37,7 @@
       <ul class='clearfix text-muted'>
         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>
       <ul class='clearfix text-muted'>
         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>

-          <% if current_user.is_friends_with?(contact) %>
+          <% if current_user.friends_with?(contact) %>

             <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
           <% else %>
             <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
             <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
           <% else %>
             <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>

diff --git a/app/views/user_mailer/friendship_notification.html.erb b/app/views/user_mailer/friendship_notification.html.erb
index 0f2353150b15d37ca0d6b0b47d806b339b0d9b09..ee2dea2ebfad31cb0bfc5a19c54cda347b0eda77 100644 (file)
--- a/app/views/user_mailer/friendship_notification.html.erb
+++ b/app/views/user_mailer/friendship_notification.html.erb
@@ -3,7 +3,7 @@
 <%= message_body do %>
   <p><%= t ".see_their_profile_html", :userurl => link_to(@viewurl, @viewurl) %></p>
 
 <%= message_body do %>
   <p><%= t ".see_their_profile_html", :userurl => link_to(@viewurl, @viewurl) %></p>
 

-  <% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
+  <% unless @friendship.befriendee.friends_with?(@friendship.befriender) -%>

   <p><%= t ".befriend_them_html", :befriendurl => link_to(@friendurl, @friendurl) %></p>
   <% end -%>
 <% end %>
   <p><%= t ".befriend_them_html", :befriendurl => link_to(@friendurl, @friendurl) %></p>
   <% end -%>
 <% end %>

diff --git a/app/views/user_mailer/friendship_notification.text.erb b/app/views/user_mailer/friendship_notification.text.erb
index da859d31c7b25bfa4cb457659a480eddd5669d41..22c2bbfe7e6efcf14845bb4ec87843d6abc2b3c1 100644 (file)
--- a/app/views/user_mailer/friendship_notification.text.erb
+++ b/app/views/user_mailer/friendship_notification.text.erb
@@ -2,6 +2,6 @@
 
 <%= t '.see_their_profile', :userurl => @viewurl %>
 
 
 <%= t '.see_their_profile', :userurl => @viewurl %>
 

-<% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
+<% unless @friendship.befriendee.friends_with?(@friendship.befriender) -%>

 <%= t '.befriend_them', :befriendurl => @friendurl %>
 <% end -%>
 <%= t '.befriend_them', :befriendurl => @friendurl %>
 <% end -%>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 8987785da38a79023ddc74c209c31a707e397fa7..4dcc9ab0546188c5a3bbed7b0128dcca7d347bf1 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -78,7 +78,7 @@
               <%= link_to t(".comments"), diary_comments_path(@user) %>
             </li>
             <li>
               <%= link_to t(".comments"), diary_comments_path(@user) %>
             </li>
             <li>

-              <% if current_user and current_user.is_friends_with?(@user) %>
+              <% if current_user and current_user.friends_with?(@user) %>

                 <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
               <% elsif current_user %>
                 <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
                 <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
               <% elsif current_user %>
                 <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>

diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb
index 51122863689bde1b2e449f1e5c4169bb548d8309..c7022e0b0b914707c549c458f347f89b8bc530a4 100644 (file)
--- a/lib/classic_pagination/pagination.rb
+++ b/lib/classic_pagination/pagination.rb
@@ -243,7 +243,7 @@ module ActionController
         raise ArgumentError, "Page/Paginator mismatch" if page.is_a?(Page) && page.paginator != self
 
         page = page.to_i
         raise ArgumentError, "Page/Paginator mismatch" if page.is_a?(Page) && page.paginator != self
 
         page = page.to_i

-        @current_page_number = has_page_number?(page) ? page : 1
+        @current_page_number = contains_page?(page) ? page : 1

       end
 
       # Returns a Page object representing this paginator's current page.
       end
 
       # Returns a Page object representing this paginator's current page.


@@ -277,7 +277,7 @@ module ActionController
       alias length page_count
 
       # Returns true if this paginator contains the page of index +number+.
       alias length page_count
 
       # Returns true if this paginator contains the page of index +number+.

-      def has_page_number?(number)
+      def contains_page?(number)

         number >= 1 && number <= page_count
       end
 
         number >= 1 && number <= page_count
       end
 


@@ -304,7 +304,7 @@ module ActionController
         def initialize(paginator, number)
           @paginator = paginator
           @number = number.to_i
         def initialize(paginator, number)
           @paginator = paginator
           @number = number.to_i

-          @number = 1 unless @paginator.has_page_number? @number
+          @number = 1 unless @paginator.contains_page? @number

         end
         attr_reader :paginator, :number
 
         end
         attr_reader :paginator, :number
 


@@ -399,12 +399,12 @@ module ActionController
         def padding=(padding)
           @padding = padding.negative? ? 0 : padding
           # Find the beginning and end pages of the window
         def padding=(padding)
           @padding = padding.negative? ? 0 : padding
           # Find the beginning and end pages of the window

-          @first = if @paginator.has_page_number?(@page.number - @padding)
+          @first = if @paginator.contains_page?(@page.number - @padding)

                      @paginator[@page.number - @padding]
                    else
                      @paginator.first
                    end
                      @paginator[@page.number - @padding]
                    else
                      @paginator.first
                    end

-          @last = if @paginator.has_page_number?(@page.number + @padding)
+          @last = if @paginator.contains_page?(@page.number + @padding)

                     @paginator[@page.number + @padding]
                   else
                     @paginator.last
                     @paginator[@page.number + @padding]
                   else
                     @paginator.last

diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index e61831fbd2feec5dd25cedee8848322537331a33..3b4eef25a35fd71e5abe4ef548cb1523ffbfa51e 100644 (file)
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -205,7 +205,7 @@ module Api
 
       # test that it really is closed now
       cs = Changeset.find(changeset.id)
 
       # test that it really is closed now
       cs = Changeset.find(changeset.id)

-      assert_not(cs.is_open?,
+      assert_not(cs.open?,

                  "changeset should be closed now (#{cs.closed_at} > #{Time.now.utc}.")
     end
 
                  "changeset should be closed now (#{cs.closed_at} > #{Time.now.utc}.")
     end
 


@@ -1743,7 +1743,7 @@ module Api
       assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes
 
       # check that the changeset is now closed as well
       assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes
 
       # check that the changeset is now closed as well

-      assert_not(changeset.is_open?,
+      assert_not(changeset.open?,

                  "changeset should have been auto-closed by exceeding " \
                  "element limit.")
     end
                  "changeset should have been auto-closed by exceeding " \
                  "element limit.")
     end

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index f35cdd23fb4c7eabb44f066aaf3d064b2e299b43..644283e84f67a687b1ca9ed400416a8a5ffae936 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -97,12 +97,12 @@ class UserTest < ActiveSupport::TestCase
     charlie = create(:user, :active)
     create(:friendship, :befriender => alice, :befriendee => bob)
 
     charlie = create(:user, :active)
     create(:friendship, :befriender => alice, :befriendee => bob)
 

-    assert alice.is_friends_with?(bob)
-    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)
+    assert alice.friends_with?(bob)
+    assert_not alice.friends_with?(charlie)
+    assert_not bob.friends_with?(alice)
+    assert_not bob.friends_with?(charlie)
+    assert_not charlie.friends_with?(bob)
+    assert_not charlie.friends_with?(alice)

   end
 
   def test_users_nearby
   end
 
   def test_users_nearby