Merge pull request #2779 from cntral/pluralize_words_ending_in_s

Allow `pluralize` to handle words that end with s.

Author: JonRowe

lib/rspec/core/formatters/helpers.rb

@@ -86,7 +86,15 @@ def self.strip_trailing_zeroes(string)
         # @param string [String] word to be pluralized
         # @return [String] pluralized word
         def self.pluralize(count, string)
-          "#{count} #{string}#{'s' unless count.to_f == 1}"
+          pluralized_string = if count.to_f == 1
+                                string
+                              elsif string.end_with?('s') # e.g. "process"
+                                "#{string}es" # e.g. "processes"
+                              else
+                                "#{string}s"
+                              end
+
+          "#{count} #{pluralized_string}"
         end
 
         # @api private

spec/rspec/core/formatters/helpers_spec.rb

@@ -117,5 +117,38 @@
     end
   end
 
+  describe "pluralize" do
+    context "when word does not end in s" do
+      let(:word){ "second" }
+
+      it "pluralizes with 0" do
+        expect(helper.pluralize(0, "second")).to eq("0 seconds")
+      end
+
+      it "does not pluralizes with 1" do
+        expect(helper.pluralize(1, "second")).to eq("1 second")
+      end
+
+      it "pluralizes with 2" do
+        expect(helper.pluralize(2, "second")).to eq("2 seconds")
+      end
+    end
+
+    context "when word ends in s" do
+      let(:word){ "process" }
+
+      it "pluralizes with 0" do
+        expect(helper.pluralize(0, "process")).to eq("0 processes")
+      end
+
+      it "does not pluralizes with 1" do
+        expect(helper.pluralize(1, "process")).to eq("1 process")
+      end
+
+      it "pluralizes with 2" do
+        expect(helper.pluralize(2, "process")).to eq("2 processes")
+      end
+    end
+  end
 
 end