Merge pull request #2314 from reitermarkus/formatter-pluralize

Replace `#plural` by `Formatter::pluralize`.

2 files changed, 23 insertions, 7 deletions

diff --git a/Library/Homebrew/test/formatter_spec.rb b/Library/Homebrew/test/formatter_spec.rb
index e8bd34416..6357853d8 100644
--- a/Library/Homebrew/test/formatter_spec.rb
+++ b/Library/Homebrew/test/formatter_spec.rb
@@ -52,4 +52,27 @@ describe Formatter do
       it { is_expected.to eq("\n") }
     end
   end
+
+  describe "::pluralize" do
+    it "pluralizes words" do
+      expect(described_class.pluralize(0, "cask")).to eq("0 casks")
+      expect(described_class.pluralize(1, "cask")).to eq("1 cask")
+      expect(described_class.pluralize(2, "cask")).to eq("2 casks")
+    end
+
+    it "allows specifying custom plural forms" do
+      expect(described_class.pluralize(1, "child", "children")).to eq("1 child")
+      expect(described_class.pluralize(2, "child", "children")).to eq("2 children")
+    end
+
+    it "has plural forms of Homebrew jargon" do
+      expect(described_class.pluralize(1, "formula")).to eq("1 formula")
+      expect(described_class.pluralize(2, "formula")).to eq("2 formulae")
+    end
+
+    it "pluralizes the last word of a string" do
+      expect(described_class.pluralize(1, "new formula")).to eq("1 new formula")
+      expect(described_class.pluralize(2, "new formula")).to eq("2 new formulae")
+    end
+  end
 end
diff --git a/Library/Homebrew/test/utils_spec.rb b/Library/Homebrew/test/utils_spec.rb
index 90eed7d88..314c299a8 100644
--- a/Library/Homebrew/test/utils_spec.rb
+++ b/Library/Homebrew/test/utils_spec.rb
@@ -219,13 +219,6 @@ describe "globally-scoped helper methods" do
     end
   end
 
-  specify "#plural" do
-    expect(plural(1)).to eq("")
-    expect(plural(0)).to eq("s")
-    expect(plural(42)).to eq("s")
-    expect(plural(42, "")).to eq("")
-  end
-
   specify "#disk_usage_readable" do
     expect(disk_usage_readable(1)).to eq("1B")
     expect(disk_usage_readable(1000)).to eq("1000B")