git-pivotal-tracker-integration 1.1.0 → 1.2.0

data/lib/git-pivotal-tracker-integration/version-update/version_update.rb

@@ -0,0 +1,20 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "git_pivotal_tracker_integration"
+
+# A module encapsulating version update implementations
+module GitPivotalTrackerIntegration::VersionUpdate
+end

data/lib/git_pivotal_tracker_integration.rb

@@ -0,0 +1,18 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# The root module for the project
+module GitPivotalTrackerIntegration
+end

data/spec/git-pivotal-tracker-integration/command/base_spec.rb

@@ -0,0 +1,38 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "git-pivotal-tracker-integration/command/base"
+require "git-pivotal-tracker-integration/command/configuration"
+require "git-pivotal-tracker-integration/util/git"
+
+describe GitPivotalTrackerIntegration::Command::Base do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+
+    @project = double("project")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
+    PivotalTracker::Project.should_receive(:find).and_return(@project)
+    @base = GitPivotalTrackerIntegration::Command::Base.new
+  end
+
+  it "should not run" do
+    lambda { @base.run }.should raise_error
+  end
+end

data/spec/git-pivotal-tracker-integration/command/configuration_spec.rb

@@ -0,0 +1,91 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "git-pivotal-tracker-integration/command/configuration"
+require "git-pivotal-tracker-integration/util/git"
+require "pivotal-tracker"
+
+describe GitPivotalTrackerIntegration::Command::Configuration do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+    @configuration = GitPivotalTrackerIntegration::Command::Configuration.new
+  end
+
+  it "should not prompt the user for the API token if it is already configured" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.api-token", :inherited).and_return("test_api_token")
+
+    api_token = @configuration.api_token
+
+    expect(api_token).to eq("test_api_token")
+  end
+
+  it "should prompt the user for the API token if it is not configured" do |variable|
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.api-token", :inherited).and_return("")
+    @configuration.should_receive(:ask).and_return("test_api_token")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("pivotal.api-token", "test_api_token", :global)
+
+    api_token = @configuration.api_token
+
+    expect(api_token).to eq("test_api_token")
+  end
+
+  it "should not prompt the user for the project id if it is already configured" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.project-id", :inherited).and_return("test_project_id")
+
+    project_id = @configuration.project_id
+
+    expect(project_id).to eq("test_project_id")
+  end
+
+  it "should prompt the user for the API token if it is not configured" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.project-id", :inherited).and_return("")
+    menu = double("menu")
+    menu.should_receive(:prompt=)
+    PivotalTracker::Project.should_receive(:all).and_return([
+      PivotalTracker::Project.new(:id => "id-2", :name => "name-2"),
+      PivotalTracker::Project.new(:id => "id-1", :name => "name-1")])
+    menu.should_receive(:choice).with("name-1")
+    menu.should_receive(:choice).with("name-2")
+    @configuration.should_receive(:choose) { |&arg| arg.call menu }.and_return("test_project_id")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("pivotal.project-id", "test_project_id", :local)
+
+    project_id = @configuration.project_id
+
+    expect(project_id).to eq("test_project_id")
+  end
+
+  it "should persist the story when requested" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("pivotal-story-id", 12345678, :branch)
+
+    @configuration.story = PivotalTracker::Story.new(:id => 12345678)
+  end
+
+  it "should return a story when requested" do
+    project = double("project")
+    stories = double("stories")
+    story = double("story")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal-story-id", :branch).and_return("12345678")
+    project.should_receive(:stories).and_return(stories)
+    stories.should_receive(:find).with(12345678).and_return(story)
+
+    result = @configuration.story project
+
+    expect(result).to be(story)
+  end
+
+end

data/spec/git-pivotal-tracker-integration/command/finish_spec.rb

@@ -0,0 +1,45 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "git-pivotal-tracker-integration/command/configuration"
+require "git-pivotal-tracker-integration/command/finish"
+require "git-pivotal-tracker-integration/util/git"
+require "pivotal-tracker"
+
+describe GitPivotalTrackerIntegration::Command::Finish do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+
+    @project = double("project")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
+    PivotalTracker::Project.should_receive(:find).and_return(@project)
+    @finish = GitPivotalTrackerIntegration::Command::Finish.new
+  end
+
+  it "should run" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:trivial_merge?)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:story)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:merge)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:push).with("master")
+
+    @finish.run
+  end
+end

data/spec/git-pivotal-tracker-integration/command/release_spec.rb

@@ -0,0 +1,57 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "git-pivotal-tracker-integration/command/configuration"
+require "git-pivotal-tracker-integration/command/release"
+require "git-pivotal-tracker-integration/util/git"
+require "git-pivotal-tracker-integration/util/story"
+require "pivotal-tracker"
+
+describe GitPivotalTrackerIntegration::Command::Release do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+
+    @project = double("project")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
+    PivotalTracker::Project.should_receive(:find).and_return(@project)
+    @release = GitPivotalTrackerIntegration::Command::Release.new
+  end
+
+  it "should run" do
+    story = PivotalTracker::Story.new(:id => 12345678)
+    updater = double("updater")
+    GitPivotalTrackerIntegration::Util::Story.should_receive(:select_story).and_return(story)
+    GitPivotalTrackerIntegration::Util::Story.should_receive(:pretty_print)
+    GitPivotalTrackerIntegration::VersionUpdate::Gradle.should_receive(:new).and_return(updater)
+    updater.should_receive(:supports?).and_return(true)
+    updater.should_receive(:current_version).and_return("test_current_version")
+    @release.should_receive(:ask).and_return("test_release_version")
+    @release.should_receive(:ask).and_return("test_next_version")
+    updater.should_receive(:update_version).with("test_release_version")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_release_tag).with("test_release_version", story)
+    updater.should_receive(:update_version).with("test_next_version")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_commit).with("test_next_version Development", story)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:push).with("master", "vtest_release_version")
+
+    @release.run(nil)
+  end
+
+end

data/spec/git-pivotal-tracker-integration/command/start_spec.rb

@@ -0,0 +1,50 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "git-pivotal-tracker-integration/command/configuration"
+require "git-pivotal-tracker-integration/command/start"
+require "git-pivotal-tracker-integration/util/git"
+require "git-pivotal-tracker-integration/util/story"
+require "pivotal-tracker"
+
+describe GitPivotalTrackerIntegration::Command::Start do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+
+    @project = double("project")
+    @story = double("story")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
+    PivotalTracker::Project.should_receive(:find).and_return(@project)
+    @start = GitPivotalTrackerIntegration::Command::Start.new
+  end
+
+  it "should run" do
+    GitPivotalTrackerIntegration::Util::Story.should_receive(:select_story).with(@project, "test_filter").and_return(@story)
+    GitPivotalTrackerIntegration::Util::Story.should_receive(:pretty_print)
+    @story.should_receive(:id).twice.and_return(12345678)
+    @start.should_receive(:ask).and_return("development_branch")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_branch).with("12345678-development_branch")
+    GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:story=)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:add_hook)
+    @story.should_receive(:update).with(:current_state => "started")
+
+    @start.run "test_filter"
+  end
+end

data/spec/git-pivotal-tracker-integration/util/git_spec.rb

@@ -0,0 +1,239 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "git-pivotal-tracker-integration/util/git"
+require "git-pivotal-tracker-integration/util/shell"
+
+describe GitPivotalTrackerIntegration::Util::Git do
+
+  before do
+    $stdout = StringIO.new
+    $stderr = StringIO.new
+  end
+
+  it "should return the current branch name" do
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git branch").and_return("   master\n * dev_branch")
+
+    current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
+
+    expect(current_branch).to eq("dev_branch")
+  end
+
+  it "should return the repository root" do
+    Dir.mktmpdir do |root|
+      child_directory = File.expand_path "child", root
+      Dir.mkdir child_directory
+
+      git_directory = File.expand_path ".git", root
+      Dir.mkdir git_directory
+
+      Dir.should_receive(:pwd).and_return(child_directory)
+
+      repository_root = GitPivotalTrackerIntegration::Util::Git.repository_root
+
+      expect(repository_root).to eq(root)
+    end
+  end
+
+  it "should raise an error there is no repository root" do
+    Dir.mktmpdir do |root|
+      child_directory = File.expand_path "child", root
+      Dir.mkdir child_directory
+
+      Dir.should_receive(:pwd).and_return(child_directory)
+
+      expect { GitPivotalTrackerIntegration::Util::Git.repository_root }.to raise_error
+    end
+  end
+
+  it "should get configuration when :branch scope is specified" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("test_branch_name")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git config branch.test_branch_name.test_key", false).and_return("test_value")
+
+    value = GitPivotalTrackerIntegration::Util::Git.get_config "test_key", :branch
+
+    expect(value).to eq("test_value")
+  end
+
+  it "should get configuration when :inherited scope is specified" do
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git config test_key", false).and_return("test_value")
+
+    value = GitPivotalTrackerIntegration::Util::Git.get_config "test_key", :inherited
+
+    expect(value).to eq("test_value")
+  end
+
+  it "should raise an error when an unknown scope is specified (get)" do
+    expect { GitPivotalTrackerIntegration::Util::Git.get_config "test_key", :unknown }.to raise_error
+  end
+
+  it "should set configuration when :branch scope is specified" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("test_branch_name")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git config --local branch.test_branch_name.test_key test_value")
+
+    GitPivotalTrackerIntegration::Util::Git.set_config "test_key", "test_value", :branch
+  end
+
+  it "should set configuration when :global scope is specified" do
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git config --global test_key test_value")
+
+    GitPivotalTrackerIntegration::Util::Git.set_config "test_key", "test_value", :global
+  end
+
+  it "should set configuration when :local scope is specified" do
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git config --local test_key test_value")
+
+    GitPivotalTrackerIntegration::Util::Git.set_config "test_key", "test_value", :local
+  end
+
+  it "should raise an error when an unknown scope is specified (set)" do
+    expect { GitPivotalTrackerIntegration::Util::Git.set_config "test_key", "test_valeu", :unknown }.to raise_error
+  end
+
+  it "should create a branch and set the root_branch and root_remote properties on it" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("remote", :branch).and_return("origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git pull --quiet --ff-only")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).and_return("git checkout --quiet -b dev_branch")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("root-branch", "master", :branch)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("root-remote", "origin", :branch)
+
+    GitPivotalTrackerIntegration::Util::Git.create_branch "dev_branch"
+  end
+
+  it "should not add a hook if it already exists" do
+    Dir.mktmpdir do |root|
+      GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root).and_return(root)
+      hook = "#{root}/.git/hooks/prepare-commit-msg"
+      File.should_receive(:exist?).with(hook).and_return(true)
+
+      GitPivotalTrackerIntegration::Util::Git.add_hook "prepare-commit-msg", __FILE__
+
+      File.should_receive(:exist?).and_call_original
+      expect(File.exist?(hook)).to be_false
+    end
+  end
+
+  it "should add a hook if it does not exist" do
+    Dir.mktmpdir do |root|
+      GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root).and_return(root)
+      hook = "#{root}/.git/hooks/prepare-commit-msg"
+      File.should_receive(:exist?).with(hook).and_return(false)
+
+      GitPivotalTrackerIntegration::Util::Git.add_hook "prepare-commit-msg", __FILE__
+
+      File.should_receive(:exist?).and_call_original
+      expect(File.exist?(hook)).to be_true
+    end
+  end
+
+  it "should add a hook if it already exists and overwrite is true" do
+    Dir.mktmpdir do |root|
+      GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root).and_return(root)
+      hook = "#{root}/.git/hooks/prepare-commit-msg"
+
+      GitPivotalTrackerIntegration::Util::Git.add_hook "prepare-commit-msg", __FILE__, true
+
+      File.should_receive(:exist?).and_call_original
+      expect(File.exist?(hook)).to be_true
+    end
+  end
+
+  it "should fail if remote tip and local tip do not match" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-remote", :branch).and_return("origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git fetch origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse origin/master").and_return("remote_tip")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("local_tip")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge-base master development_branch").and_return("common_ancestor")
+
+    lambda { GitPivotalTrackerIntegration::Util::Git.trivial_merge? }.should raise_error(SystemExit)
+
+    expect($stderr.string).to match(/FAIL/)
+  end
+
+  it "should fail if local tip and common ancestor do not match" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-remote", :branch).and_return("origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git fetch origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse origin/master").and_return("HEAD")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("HEAD")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge-base master development_branch").and_return("common_ancestor")
+
+    lambda { GitPivotalTrackerIntegration::Util::Git.trivial_merge? }.should raise_error(SystemExit)
+
+    expect($stderr.string).to match(/FAIL/)
+  end
+
+  it "should pass if remote tip, local tip, and common ancestor all match" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-remote", :branch).and_return("origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git fetch origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse origin/master").and_return("HEAD")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git rev-parse master").and_return("HEAD")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge-base master development_branch").and_return("HEAD")
+
+    GitPivotalTrackerIntegration::Util::Git.trivial_merge?
+
+    expect($stdout.string).to match(/OK/)
+  end
+
+  it "should merge and delete branches" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("development_branch")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("root-branch", :branch).and_return("master")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git checkout --quiet master")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git merge --quiet --no-ff -m \"Merge development_branch to master\n\n[Completes #12345678]\" development_branch")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git branch --quiet -D development_branch")
+
+    GitPivotalTrackerIntegration::Util::Git.merge PivotalTracker::Story.new(:id => 12345678)
+  end
+
+it "should push changes without refs" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("remote", :branch).and_return("origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git push --quiet origin ")
+
+    GitPivotalTrackerIntegration::Util::Git.push
+  end
+
+  it "should push changes with refs" do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("remote", :branch).and_return("origin")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git push --quiet origin foo bar")
+
+    GitPivotalTrackerIntegration::Util::Git.push "foo", "bar"
+  end
+
+  it "should create a commit" do
+    story = PivotalTracker::Story.new(:id => 123456789)
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git commit --quiet --all --allow-empty --message \"test_message\n\n[#123456789]\"")
+
+    GitPivotalTrackerIntegration::Util::Git.create_commit "test_message", story
+  end
+
+  it "should create a release tag" do
+    story = PivotalTracker::Story.new(:id => 123456789)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_branch).with("pivotal-tracker-release", false)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_commit).with("1.0.0.RELEASE Release", story)
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git tag v1.0.0.RELEASE")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git checkout --quiet master")
+    GitPivotalTrackerIntegration::Util::Shell.should_receive(:exec).with("git branch --quiet -D pivotal-tracker-release")
+
+    GitPivotalTrackerIntegration::Util::Git.create_release_tag "1.0.0.RELEASE", story
+  end
+end