Don't use underscores in (new) bottle filenames.

Closes Homebrew/homebrew#14270

4 files changed, 13 insertions, 13 deletions

diff --git a/Library/Homebrew/test/test_bottles.rb b/Library/Homebrew/test/test_bottles.rb
index 8f5104f36..19d502b72 100644
--- a/Library/Homebrew/test/test_bottles.rb
+++ b/Library/Homebrew/test/test_bottles.rb
@@ -19,7 +19,7 @@ class BottleTests < Test::Unit::TestCase
       f = SnowLeopardBottleSpecTestBall.new
 
       assert_equal case MacOS.cat
-        when :snowleopard then f.bottle
+        when :snow_leopard then f.bottle
         else f.stable
         end, f.active_spec
 
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index a2c6940ff..69583c15c 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -103,9 +103,9 @@ class FormulaTests < Test::Unit::TestCase
     assert_equal :sha1, f.bottle.checksum.hash_type
     assert_equal :sha256, f.devel.checksum.hash_type
     assert_equal case MacOS.cat
-      when :snowleopard then 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
+      when :snow_leopard then 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
       when :lion then 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d'
-      when :mountainlion then '8badf00d8badf00d8badf00d8badf00d8badf00d'
+      when :mountain_lion then '8badf00d8badf00d8badf00d8badf00d8badf00d'
       end, f.bottle.checksum.hexdigest
     assert_match /[0-9a-fA-F]{40}/, f.stable.checksum.hexdigest
     assert_match /[0-9a-fA-F]{64}/, f.devel.checksum.hexdigest
@@ -241,9 +241,9 @@ class FormulaTests < Test::Unit::TestCase
 
     assert_equal 1, f.bottle.revision
     assert_equal case MacOS.cat
-      when :snowleopard then 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
+      when :snow_leopard then 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
       when :lion then 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d'
-      when :mountainlion then '8badf00d8badf00d8badf00d8badf00d8badf00d'
+      when :mountain_lion then '8badf00d8badf00d8badf00d8badf00d8badf00d'
       end, f.bottle.checksum.hexdigest
   end
 
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index 663e7c78d..0458481b4 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -212,7 +212,7 @@ class VersionParsingTests < Test::Unit::TestCase
   end
 
   def test_another_erlang_bottle_style
-    assert_version_detected 'R15B01', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B01.mountainlion.bottle.tar.gz'
+    assert_version_detected 'R15B01', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B01.mountain_lion.bottle.tar.gz'
   end
 
   def test_yet_another_erlang_bottle_style
diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/testball.rb
index 4ea4027e8..cb94fd40b 100644
--- a/Library/Homebrew/test/testball.rb
+++ b/Library/Homebrew/test/testball.rb
@@ -107,9 +107,9 @@ class SpecTestBall < Formula
   end
 
   bottle do
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snowleopard
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
     sha1 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d' => :lion
-    sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountainlion
+    sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountain_lion
   end
 
   def initialize name=nil
@@ -189,7 +189,7 @@ class SnowLeopardBottleSpecTestBall < Formula
   sha1 '482e737739d946b7c8cbaf127d9ee9c148b999f5'
 
   bottle do
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snowleopard
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
   end
 
   def initialize name=nil
@@ -217,9 +217,9 @@ class AllCatsBottleSpecTestBall < Formula
   sha1 '482e737739d946b7c8cbaf127d9ee9c148b999f5'
 
   bottle do
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snowleopard
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
     sha1 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d' => :lion
-    sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountainlion
+    sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountain_lion
   end
 
   def initialize name=nil
@@ -234,9 +234,9 @@ class RevisedBottleSpecTestBall < Formula
 
   bottle do
     version 1
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snowleopard
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
     sha1 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d' => :lion
-    sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountainlion
+    sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountain_lion
   end
 
   def initialize name=nil