@@ -15,7 +15,7 @@ describe "Adding a mirror in a clean repository" do it "should add the files and commit" do in_dir(@shiny) do - `braid add --type git #{@skit1}` + `#{BRAID_BIN} add --type git #{@skit1}` end file_name = "skit1/layouts/layout.liquid" @@ -29,7 +29,7 @@ describe "Adding a mirror in a clean repository" do it "should create .braids and add the mirror to it" do in_dir(@shiny) do - `braid add --type git #{@skit1}` + `#{BRAID_BIN} add --type git #{@skit1}` end braids = YAML::load_file("#{@shiny}/.braids") @@ -50,7 +50,7 @@ describe "Adding a mirror in a clean repository" do it "should add the files and commit" do in_dir(@shiny) do - `braid add --type svn #{@skit1}` + `#{BRAID_BIN} add --type svn #{@skit1}` end file_name = "skit1/layouts/layout.liquid" @@ -64,7 +64,7 @@ describe "Adding a mirror in a clean repository" do it "should create .braids and add the mirror to it" do in_dir(@shiny) do - `braid add --type svn #{@skit1}` + `#{BRAID_BIN} add --type svn #{@skit1}` end braids = YAML::load_file("#{@shiny}/.braids") @@ -73,7 +73,7 @@ describe "Adding a mirror in a clean repository" do braids["skit1"]["type"].should == "svn" braids["skit1"]["revision"].should == 1 braids["skit1"]["remote"].should == "braid/skit1" - braids["skit1"]["branch"].should.be nil + braids["skit1"]["branch"].should.be == nil end end test/integration/adding_spec.rb @@ -13,7 +13,7 @@ describe "Updating a mirror without conflicts" do @skit1 = create_git_repo_from_fixture("skit1") in_dir(@shiny) do - `braid add --type git #{@skit1}` + `#{BRAID_BIN} add --type git #{@skit1}` end update_dir_from_fixture("skit1", "skit1.1") @@ -32,7 +32,7 @@ describe "Updating a mirror without conflicts" do it "should add the files and commit" do in_dir(@shiny) do - `braid update skit1` + `#{BRAID_BIN} update skit1` end file_name = "layouts/layout.liquid" @@ -53,7 +53,7 @@ describe "Updating a mirror without conflicts" do @skit1_wc = File.join(TMP_PATH, "skit1_wc") in_dir(@shiny) do - `braid add --type svn #{@skit1}` + `#{BRAID_BIN} add --type svn #{@skit1}` end update_dir_from_fixture("skit1_wc", "skit1.1") @@ -70,7 +70,7 @@ describe "Updating a mirror without conflicts" do it "should add the files and commit" do in_dir(@shiny) do - `braid update skit1` + `#{BRAID_BIN} update skit1` end file_name = "layouts/layout.liquid" test/integration/updating_spec.rb @@ -2,21 +2,15 @@ require 'rubygems' require 'test/spec' require 'mocha' -#require File.dirname(__FILE__) + '/../lib/braid' - require 'tempfile' require 'fileutils' require 'pathname' -#tmp_file = Tempfile.new("braid") -#tmp_file_path = tmp_file.path -#tmp_file.unlink -#TMP = File.basename(tmp_file_path) - TMP_PATH = File.join(Dir.tmpdir, "braid_integration") BRAID_PATH = Pathname.new(File.dirname(__FILE__)).parent.realpath FIXTURE_PATH = File.join(BRAID_PATH, "test", "fixtures") FileUtils.mkdir_p(TMP_PATH) +BRAID_BIN = File.join(BRAID_PATH, "bin", "braid") #def exec(cmd) # `cd #{TMP} && #{cmd}` test/integration_helper.rb c90458776d325c86c15208f1820f4883c1a70243 Cristi Balan evil@che.lu http://github.com/evilchelu/braid/commit/249f33f463b9287036c1a64fb5c0e567d06eb231 249f33f463b9287036c1a64fb5c0e567d06eb231 2008-08-19T13:27:08-07:00 2008-08-19T13:18:56-07:00 test the local braid, not the installed one 0f85d4b0371f04c0874b8f81be6ae83b488b9cd6 Cristi Balan evil@che.lu