RSpec 2 and 3 have the same message format on failure

teamtopia · Apr 30, 2015 · afbb3af · afbb3af
1 parent 65b7776
commit afbb3af
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/spec/support/matchers/have_column.rb b/spec/support/matchers/have_column.rb
@@ -8,17 +8,16 @@
     column && column.default.to_s == @default.to_s
   end
 
-  if RSpec::Version::STRING.to_i >= 3
-    failure_message do |columns|
-      "expected to find '#{column_name}', " +
-        "default '#{@default}' " +
-        "in #{columns.map { |column| [column.name, column.default] }}"
-    end
-  else
-    failure_message_for_should do |columns|
-      "expected to find '#{column_name}', " +
-        "default '#{@default}' " +
-        "in #{columns.map { |column| [column.name, column.default] }}"
+  failure_message_method =
+    if RSpec::Version::STRING.to_i >= 3
+      :failure_message
+    else
+      :failure_message_for_should
     end
+
+  send(failure_message_method) do |columns|
+    "expected to find '#{column_name}', " +
+      "default '#{@default}' " +
+      "in #{columns.map { |column| [column.name, column.default] }}"
   end
 end