Skip to content
This repository has been archived by the owner on Jun 8, 2019. It is now read-only.

Commit

Permalink
Merge branch 'sync_origin' of https://github.com/tapajos/kumade
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-burns committed Oct 5, 2011
2 parents 82971ab + 77e4f33 commit 92a88b6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions lib/kumade/deployer.rb
Expand Up @@ -28,14 +28,14 @@ def deploy
def pre_deploy
ensure_clean_git
package_assets
sync_github
sync_origin
end

def package_assets
@packager.run
end

def sync_github
def sync_origin
git.push(@branch)
end

Expand Down
6 changes: 3 additions & 3 deletions spec/kumade/deployer_spec.rb
Expand Up @@ -38,17 +38,17 @@
end
end

describe Kumade::Deployer, "#sync_github" do
describe Kumade::Deployer, "#sync_origin" do
let(:new_branch) { 'new-branch' }

before do
`git checkout -b #{new_branch}`
end

it "pushes the current branch to github" do
it "pushes the current branch to origin" do
subject.git.expects(:push).with(new_branch)

subject.sync_github
subject.sync_origin
end
end

Expand Down

0 comments on commit 92a88b6

Please sign in to comment.