Merge pull request #731 from MikeMcQuaid/rename-bottle-revision

Rename bottle's revision to rebuild.

3 files changed, 5 insertions, 5 deletions

diff --git a/Library/Homebrew/test/test_bottle_filename.rb b/Library/Homebrew/test/test_bottle_filename.rb
index 1d8cced8b..6604e7d6a 100644
--- a/Library/Homebrew/test/test_bottle_filename.rb
+++ b/Library/Homebrew/test/test_bottle_filename.rb
@@ -3,8 +3,8 @@ require "formula"
 require "software_spec"
 
 class BottleFilenameTests < Homebrew::TestCase
-  def fn(revision)
-    Bottle::Filename.new("foo", "1.0", :tag, revision)
+  def fn(rebuild)
+    Bottle::Filename.new("foo", "1.0", :tag, rebuild)
   end
 
   def test_prefix_suffix
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 330e7c0a8..42225bcbc 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -288,7 +288,7 @@ class IntegrationCommandTests < Homebrew::TestCase
   def test_bottle
     cmd("install", "--build-bottle", testball)
     assert_match "Formula not from core or any taps",
-                 cmd_fail("bottle", "--no-revision", testball)
+                 cmd_fail("bottle", "--no-rebuild", testball)
 
     setup_test_formula "testball"
 
@@ -298,7 +298,7 @@ class IntegrationCommandTests < Homebrew::TestCase
       FileUtils.ln_s "not-exist", "symlink"
     end
     assert_match(/testball-0\.1.*\.bottle\.tar\.gz/,
-                  cmd_output("bottle", "--no-revision", "testball"))
+                  cmd_output("bottle", "--no-rebuild", "testball"))
   ensure
     FileUtils.rm_f Dir["testball-0.1*.bottle.tar.gz"]
   end
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index c7acbaade..efd3eff95 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -173,7 +173,7 @@ class BottleSpecificationTests < Homebrew::TestCase
 
   def test_other_setters
     double = Object.new
-    %w[root_url prefix cellar revision].each do |method|
+    %w[root_url prefix cellar rebuild].each do |method|
       @spec.send(method, double)
       assert_equal double, @spec.send(method)
     end