Merge pull request #2082 from reitermarkus/spec-os_mac_language

Convert `os/mac/language` test to spec.

3 files changed, 23 insertions, 22 deletions

diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 244fbe027..9cabb3d61 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -57,9 +57,7 @@ module Homebrew
       ENV["SEED"] = ARGV.next if ARGV.include? "--seed"
 
       files = Dir.glob("test/**/*_{spec,test}.rb")
-                 .reject { |p| !OS.mac? && p.start_with?("test/os/mac/") }
-                 .reject { |p| !OS.mac? && p.start_with?("test/cask/") }
-                 .reject { |p| p.start_with?("test/vendor/bundle/") }
+                 .reject { |p| !OS.mac? && p =~ %r{^test/(os/mac|cask)(/.*|_(test|spec)\.rb)$} }
 
       test_args = []
       test_args << "--trace" if ARGV.include? "--trace"
diff --git a/Library/Homebrew/test/os/mac/language_test.rb b/Library/Homebrew/test/os/mac/language_test.rb
deleted file mode 100644
index e328db5e0..000000000
--- a/Library/Homebrew/test/os/mac/language_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "testing_env"
-require "locale"
-require "os/mac"
-
-class OSMacLanguageTests < Homebrew::TestCase
-  def test_languages_format
-    OS::Mac.languages.each do |language|
-      assert_nothing_raised do
-        Locale.parse(language)
-      end
-    end
-  end
-
-  def test_language_format
-    assert_nothing_raised do
-      Locale.parse(OS::Mac.language)
-    end
-  end
-end
diff --git a/Library/Homebrew/test/os/mac_spec.rb b/Library/Homebrew/test/os/mac_spec.rb
new file mode 100644
index 000000000..641782451
--- /dev/null
+++ b/Library/Homebrew/test/os/mac_spec.rb
@@ -0,0 +1,22 @@
+require "locale"
+require "os/mac"
+
+describe OS::Mac do
+  describe "::languages" do
+    specify "all languages can be parsed by Locale::parse" do
+      subject.languages.each do |language|
+        expect { Locale.parse(language) }.not_to raise_error
+      end
+    end
+  end
+
+  describe "::language" do
+    it "returns the first item from #languages" do
+      expect(subject.language).to eq(subject.languages.first)
+    end
+
+    it "can be parsed by Locale::parse" do
+      expect { Locale.parse(subject.language) }.not_to raise_error
+    end
+  end
+end