Remove guard clauses

thoughtbot · Dec 9, 2019 · 82bba4c · 82bba4c
1 parent 5b2b8fc
commit 82bba4c
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/lib/shoulda/matchers/active_record/have_implicit_order_column.rb b/lib/shoulda/matchers/active_record/have_implicit_order_column.rb
@@ -53,25 +53,29 @@ def description
 
         def column_exists?
           matcher = HaveDbColumnMatcher.new(@column)
-          return true if matcher.matches?(@subject)
 
-          @details = "#{model_class} does not have a db column named #{@column}"
-          false
+          if matcher.matches?(@subject)
+            true
+          else
+            @details = "#{model_class} does not have a db column named #{@column}"
+            false
+          end
         end
 
         def implicit_order_column_matches?
           model_implicit_order_column = model_class.implicit_order_column
 
-          return true if model_implicit_order_column.to_s == @column.to_s
-
-          @details = if model_implicit_order_column.nil?
-                       "#{model_class} implicit_order_column is not set"
-                     else
-                       "#{model_class} implicit_order_column is " +
-                         "set to #{model_implicit_order_column}"
-                     end
-
-          false
+          if model_implicit_order_column.to_s == @column.to_s
+            true
+          else
+            @details = if model_implicit_order_column.nil?
+                         "#{model_class} implicit_order_column is not set"
+                       else
+                         "#{model_class} implicit_order_column is " +
+                           "set to #{model_implicit_order_column}"
+                       end
+            false
+          end
         end
 
         def model_class