From 97fe1686f5adcbdf21be327cbce95fb31c5dcce6 Mon Sep 17 00:00:00 2001
From: muratayusuke <info@muratayusuke.com>
Date: Thu, 30 May 2013 17:38:06 +0000
Subject: [PATCH] refactor given_castle

---
 spec/homesick_spec.rb | 6 +++---
 spec/spec_helper.rb   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/spec/homesick_spec.rb b/spec/homesick_spec.rb
index b5ac78f..774741a 100644
--- a/spec/homesick_spec.rb
+++ b/spec/homesick_spec.rb
@@ -122,7 +122,7 @@ describe "homesick" do
     end
 
     context "with '.config' in .homesick_subdir" do
-      let(:castle) { given_castle("glencairn", "glencairn", [".config"]) }
+      let(:castle) { given_castle("glencairn", [".config"]) }
       it "can symlink in sub directory" do
         dotdir = castle.directory(".config")
         dotfile = dotdir.file(".some_dotfile")
@@ -136,7 +136,7 @@ describe "homesick" do
     end
 
     context "with '.config/appA' in .homesick_subdir" do
-      let(:castle) { given_castle("glencairn", "glencairn", [".config/appA"]) }
+      let(:castle) { given_castle("glencairn", [".config/appA"]) }
       it "can symlink in nested sub directory" do
         dotdir = castle.directory(".config").directory("appA")
         dotfile = dotdir.file(".some_dotfile")
@@ -153,7 +153,7 @@ describe "homesick" do
   describe "list" do
     it "should say each castle in the castle directory" do
       given_castle('zomg')
-      given_castle('zomg', 'wtf/zomg')
+      given_castle('wtf/zomg')
 
       homesick.should_receive(:say_status).with("zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
       homesick.should_receive(:say_status).with("wtf/zomg", "git://github.com/technicalpickles/zomg.git", :cyan)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 26225f4..9dfb5cb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,7 +16,8 @@ RSpec.configure do |config|
     homesick.stub(:say_status)
   end
 
-  def given_castle(name, path=name, subdirs=[])
+  def given_castle(path, subdirs=[])
+    name = Pathname.new(path).basename
     castles.directory(path) do |castle|
       Dir.chdir(castle) do
         system "git init >/dev/null 2>&1"