Merge branch 'master' into exclude-executable-metafiles

Added tests in keg_test and pathname_test was
moved into keg_spec and pathname_spec.

1 files changed, 60 insertions, 0 deletions

diff --git a/Library/Homebrew/test/dev-cmd/pull_spec.rb b/Library/Homebrew/test/dev-cmd/pull_spec.rb
new file mode 100644
index 000000000..3c0108df2
--- /dev/null
+++ b/Library/Homebrew/test/dev-cmd/pull_spec.rb
@@ -0,0 +1,60 @@
+describe "brew pull", :integration_test do
+  it "fails when no argument is given" do
+    expect { brew "pull" }
+      .to output(/This command requires at least one argument/).to_stderr
+      .and not_to_output.to_stdout
+      .and be_a_failure
+  end
+
+  it "fetches a patch from a GitHub commit or pull request and applies it" do
+    skip "Requires network connection." if ENV["HOMEBREW_NO_GITHUB_API"]
+
+    CoreTap.instance.path.cd do
+      shutup do
+        system "git", "init"
+        system "git", "checkout", "-b", "new-branch"
+      end
+    end
+
+    expect { brew "pull", "https://bot.brew.sh/job/Homebrew\%20Testing/1028/" }
+      .to output(/Testing URLs require `\-\-bottle`!/).to_stderr
+      .and not_to_output.to_stdout
+      .and be_a_failure
+
+    expect { brew "pull", "1" }
+      .to output(/Fetching patch/).to_stdout
+      .and output(/Current branch is new\-branch/).to_stderr
+      .and be_a_failure
+
+    expect { brew "pull", "--bump", "8" }
+      .to output(/Fetching patch/).to_stdout
+      .and output(/No changed formulae found to bump/).to_stderr
+      .and be_a_failure
+
+    expect { brew "pull", "--bump", "https://api.github.com/repos/Homebrew/homebrew-core/pulls/122" }
+      .to output(/Fetching patch/).to_stdout
+      .and output(/Can only bump one changed formula/).to_stderr
+      .and be_a_failure
+
+    expect { brew "pull", "https://github.com/Homebrew/homebrew-core/pull/1" }
+      .to output(/Fetching patch/).to_stdout
+      .and output(/Patch failed to apply/).to_stderr
+      .and be_a_failure
+  end
+
+  describe "--rebase" do
+    it "fails" do
+      expect { brew "pull", "--rebase" }
+        .to output(/You meant `git pull --rebase`./).to_stderr
+        .and not_to_output.to_stdout
+        .and be_a_failure
+    end
+  end
+
+  it "fails when given 0" do
+    expect { brew "pull", "0" }
+      .to output(/Not a GitHub pull request or commit/).to_stderr
+      .and not_to_output.to_stdout
+      .and be_a_failure
+  end
+end