git-contest 0.1.1 → 0.1.2

data/spec/bin/t005_git_contest_branching_spec.rb

@@ -1,83 +1,70 @@
 require "spec_helper"
 
-describe "T005" do
-
-  before(:each) do
-    init_env
-    ENV['GIT_CONTEST_HOME'] = get_path('/mock/default_config')
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t005"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-    # ENV['GIT_CONTEST_DEBUG'] = 'ON'
-  end
-
-  after(:each) do
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
-  describe "001" do
-
+describe "T005: branching" do
+  context "A001" do
     before do
-      ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t005/001/config.yml')
-      Dir.mkdir '001'
-      Dir.chdir '001'
-    end
-
-    describe '001' do
-
-      before do
-        Dir.mkdir '001'
-        Dir.chdir '001'
+      ENV['GIT_CONTEST_CONFIG'] = "#{@temp_dir}/home/config.yml"
+      File.open ENV['GIT_CONTEST_CONFIG'], "w" do |file|
+        file.write <<EOF
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
       end
+    end
 
+    context 'B001' do 
       it '001: init -> start -> submit -> submit -> finish' do
         Dir.mkdir 'test1'
         Dir.chdir 'test1'
+
         # Init
         bin_exec "init --defaults"
-        git_current_branch.should === 'master'
+        expect(git_current_branch).to eq 'master'
         ret = git_do "log --oneline"
-        ret.include?('Initial commit').should === true
+        expect(ret).to include 'Initial commit'
+
         # Start
         bin_exec "start contest1"
-        git_current_branch.should === 'contest/contest1'
+        expect(git_current_branch).to eq 'contest/contest1'
+
         # Edit.1
         File.open 'main.c', 'w' do |file|
           file.write 'wa-code'
         end
+
         # Submit.1
         bin_exec "submit test_dummy -c 1000 -p A"
         ret = git_do "log --oneline"
-        ret.include?('Dummy 1000A: Wrong Answer').should === true
+        expect(ret).to include 'Dummy 1000A: Wrong Answer'
+
         ret = git_do "ls-files"
-        ret.include?('main.c').should === true
+        expect(ret).to include 'main.c'
+
         # Edit.2 fixed
         File.open 'main.c', 'w' do |file|
           file.write 'ac-code'
         end
+
         # Submit.2
         bin_exec "submit test_dummy -c 1000 -p A"
         ret = git_do "log --oneline"
-        ret.include?('Dummy 1000A: Accepted').should === true
+        expect(ret).to include 'Dummy 1000A: Accepted'
+
         ret = git_do "ls-files"
-        ret.include?('main.c').should === true
+        expect(ret).to include 'main.c'
+
         # Finish
         bin_exec "finish --no-edit"
-        git_current_branch.should === 'master'
+        expect(git_current_branch).to eq 'master'
+
         ret = git_do "log --oneline"
-        ret.include?('Dummy 1000A: Wrong Answer').should === true
-        ret.include?('Dummy 1000A: Accepted').should === true
-        # Clean
-        FileUtils.remove_dir '.git', :force => true
-        FileUtils.remove 'main.c'
-        Dir.chdir '..'
-        Dir.rmdir 'test1'
+        expect(ret).to include 'Dummy 1000A: Wrong Answer'
+        expect(ret).to include 'Dummy 1000A: Accepted'
       end
-
     end
-
   end
-
 end
 

data/spec/bin/t007_git_contest_start_spec.rb

@@ -1,42 +1,21 @@
 require "spec_helper"
 
 describe "T007: git-contest-start" do
-
-  before(:each) do
-    init_env
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t007"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-    # debug_on
-  end
-
-  after(:each) do
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
-  describe "001: specify based branch" do
-
+  context "A001: specify based branch" do
     before do
-      Dir.mkdir "001"
-      Dir.chdir "001"
       bin_exec "init --defaults"
     end
 
-    after do
-      Dir.chdir ".."
-    end
-
     it "001" do
       git_do "checkout -b base1"
       git_do "commit --allow-empty -m 'this is commit'"
       git_do "checkout master"
       bin_exec "start test1"
       ret1 = git_do "log --oneline"
-      ret1.include?("this is commit").should === false
+      expect(ret1).not_to include "this is commit"
       bin_exec "start test2 base1"
       ret2 = git_do "log --oneline"
-      ret2.include?("this is commit").should === true
+      expect(ret2).to include "this is commit"
     end
 
     it "002" do
@@ -45,10 +24,10 @@ describe "T007: git-contest-start" do
       git_do "checkout master"
       bin_exec "start test1 base1"
       ret1 = git_do "log --oneline"
-      ret1.include?("this is commit").should === true
+      expect(ret1).to include "this is commit"
       bin_exec "start test2"
       ret2 = git_do "log --oneline"
-      ret2.include?("this is commit").should === false
+      expect(ret2).not_to include "this is commit"
     end
 
     it "003" do
@@ -56,10 +35,10 @@ describe "T007: git-contest-start" do
       git_do "commit --allow-empty -m 'this is commit'"
       bin_exec "start test1 base1"
       ret1 = git_do "log --oneline"
-      ret1.include?("this is commit").should === true
+      expect(ret1).to include "this is commit"
       bin_exec "start test2"
       ret2 = git_do "log --oneline"
-      ret2.include?("this is commit").should === false
+      expect(ret2).not_to include "this is commit"
     end
 
     it "004" do
@@ -67,25 +46,14 @@ describe "T007: git-contest-start" do
       git_do "commit --allow-empty -m 'this is commit'"
       bin_exec "start test1"
       ret1 = git_do "log --oneline"
-      ret1.include?("this is commit").should === false
+      expect(ret1).not_to include "this is commit"
       bin_exec "start test2 base1"
       ret2 = git_do "log --oneline"
-      ret2.include?("this is commit").should === true
+      expect(ret2).to include "this is commit"
     end
-
   end
 
-  describe "002: --fetch" do
-
-    before do
-      Dir.mkdir "002"
-      Dir.chdir "002"
-    end
-
-    after do
-      Dir.chdir ".."
-    end
-
+  context "A002: --fetch" do
     it "001" do
       Dir.mkdir "test1"
       Dir.chdir "test1"
@@ -95,27 +63,26 @@ describe "T007: git-contest-start" do
       Dir.chdir "test1"
       10.times {|x| git_do "commit --allow-empty -m 'this is commit'" }
       ret1 = git_do "log --oneline master"
+      expect(ret1).to include "this is commit"
+
       Dir.chdir ".."
       Dir.chdir "test2"
       # init
       bin_exec "init --defaults"
       # fetch
       ret2 = git_do "log --oneline origin/master"
+      expect(ret2).not_to include "this is commit"
+
       ret_start1 = bin_exec "start branch1 --fetch"
+      expect(ret_start1).not_to include "Summary of actions:"
+
       ret3 = git_do "log --oneline origin/master"
+      expect(ret3).to include "this is commit"
+
       git_do "pull origin master"
       ret_start2 = bin_exec "start branch2 --fetch"
-      # check
-      ret1.include?("this is commit").should            === true
-      ret2.include?("this is commit").should            === false
-      ret3.include?("this is commit").should            === true
-      ret_start1.include?("Summary of actions:").should === false
-      ret_start2.include?("Summary of actions:").should === true
-      # clean
-      Dir.chdir ".."
+      expect(ret_start2).to include "Summary of actions:"
     end
-
   end
-
 end
 

data/spec/bin/t008_git_contest_finish_spec.rb

@@ -3,31 +3,7 @@ require "spec_helper"
 # Do not forget --no-edit option
 
 describe "T008: git-contest-finish" do
-
-  before(:each) do
-    init_env
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t008"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-    # debug_on
-  end
-
-  after(:each) do
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
-  describe "001: --keep" do
-
-    before do
-      Dir.mkdir "001"
-      Dir.chdir "001"
-    end
-
-    after do
-      Dir.chdir ".."
-    end
-
+  context "A001: --keep" do
     it "001: init -> start -> empty-commits -> finish" do
       bin_exec "init --defaults"
       bin_exec "start branch1"
@@ -35,8 +11,8 @@ describe "T008: git-contest-finish" do
       bin_exec "finish --no-edit"
       ret1 = git_do "branch"
       ret_log1 = git_do "log --oneline master"
-      ret1.include?("branch1").should === false
-      ret_log1.include?("this is commit").should === true
+      expect(ret1).not_to include "branch1"
+      expect(ret_log1).to include "this is commit"
     end
 
     it "002: init -> start -> empty-commits -> finish --keep" do
@@ -46,8 +22,8 @@ describe "T008: git-contest-finish" do
       bin_exec "finish --no-edit --keep"
       ret1 = git_do "branch"
       ret_log1 = git_do "log --oneline master"
-      ret1.include?("branch1").should === true
-      ret_log1.include?("this is commit").should === true
+      expect(ret1).to include "branch1"
+      expect(ret_log1).to include "this is commit"
     end
 
     it "003: init -> start -> empty-commits -> finish -k" do
@@ -57,23 +33,13 @@ describe "T008: git-contest-finish" do
       bin_exec "finish --no-edit -k"
       ret1 = git_do "branch"
       ret_log1 = git_do "log --oneline master"
-      ret1.include?("branch1").should === true
-      ret_log1.include?("this is commit").should === true
+      expect(ret1).to include "branch1"
+      expect(ret_log1).to include "this is commit"
     end
 
   end
 
-  describe "002: --rebase" do
-
-    before do
-      Dir.mkdir "002"
-      Dir.chdir "002"
-    end
-
-    after do
-      Dir.chdir ".."
-    end
-
+  context "A002: --rebase" do
     it "001: init -> start -> empty-commits -> finish --rebase" do
       # create branches: branch1(normal) -> branch2(rebase) -> branch3(normal)
       bin_exec "init --defaults"
@@ -105,28 +71,18 @@ describe "T008: git-contest-finish" do
       bin_exec "finish branch3 --no-edit"
       ret_branch_2 = git_do "branch"
       ret_log = git_do "log --oneline"
-      ret_branch_1.include?("branch1").should === true
-      ret_branch_1.include?("branch2").should === true
-      ret_branch_1.include?("branch3").should === true
-      ret_branch_2.include?("branch1").should === false
-      ret_branch_2.include?("branch2").should === false
-      ret_branch_2.include?("branch3").should === false
+      expect(ret_branch_1).to include "branch1"
+      expect(ret_branch_1).to include "branch2"
+      expect(ret_branch_1).to include "branch3"
+      expect(ret_branch_2).not_to include "branch1"
+      expect(ret_branch_2).not_to include "branch2"
+      expect(ret_branch_2).not_to include "branch3"
       (!!ret_log.match(/test-2.*test-3.*test-1/m)).should === true
     end
 
   end
 
-  describe "003: --force-delete" do
-
-    before do
-      Dir.mkdir "003"
-      Dir.chdir "003"
-    end
-
-    after do
-      Dir.chdir ".."
-    end
-
+  context "A003: --force-delete" do
     # TODO: recheck
     it "001: init -> start -> trigger merge error -> finish --force-delete" do
       # make conflict
@@ -152,23 +108,12 @@ describe "T008: git-contest-finish" do
       bin_exec "finish branch1 --no-edit"
       bin_exec "finish branch2 --force-delete --no-edit"
       ret_branch = git_do "branch"
-      ret_branch.include?("contest/branch1").should === false
-      ret_branch.include?("contest/branch2").should === false
+      expect(ret_branch).not_to include "contest/branch1"
+      expect(ret_branch).not_to include "contest/branch2"
     end
-
   end
 
-  describe "004: --squash" do
-
-    before do
-      Dir.mkdir "004"
-      Dir.chdir "004"
-    end
-
-    after do
-      Dir.chdir ".."
-    end
-
+  context "A004: --squash" do
     it "001: init -> start -> empty-commits -> finish --squash" do
       bin_exec "init --defaults"
       bin_exec "start branch1"
@@ -181,18 +126,14 @@ describe "T008: git-contest-finish" do
       bin_exec "finish --no-edit --squash branch1"
       ret_log1 = git_do "log --oneline"
       ret_branch1 = git_do "branch"
-      ret_branch1.include?("branch1").should === false
-      ret_log1.include?("this is commit").should === true
-      ret_log1.include?("Squashed commit").should === true
+      expect(ret_branch1).not_to include "branch1"
+      expect(ret_log1).to include "this is commit"
+      expect(ret_log1).to include "Squashed commit"
     end
-
   end
 
-  describe "005: --fetch" do
-
+  context "A005: --fetch" do
     before do
-      Dir.mkdir "005"
-      Dir.chdir "005"
       Dir.mkdir "src"
       Dir.chdir "src"
       bin_exec "init --defaults"
@@ -200,15 +141,9 @@ describe "T008: git-contest-finish" do
       10.times {|x| git_do "commit --allow-empty -m 'this is commit #{x}'" }
       Dir.chdir ".."
       git_do "clone src dest"
-
       Dir.chdir "dest"
     end
 
-    after do
-      Dir.chdir ".."
-      Dir.chdir ".."
-    end
-
     it "001: init -> start -> clone -> checkout@dest -> empty-commits@dest -> finish@dest" do
       git_do "checkout -b master origin/master"
       bin_exec "init --defaults"
@@ -219,11 +154,9 @@ describe "T008: git-contest-finish" do
       Dir.chdir "src"
       ret_branch1 = git_do "branch"
       git_do "checkout master"
-      ret_branch1.include?('branch1').should === true
-      ret_branch2.include?('branch1').should === false
+      expect(ret_branch1).to include 'branch1'
+      expect(ret_branch2).not_to include 'branch1'
     end
-
   end
-
 end
 

data/spec/bin/t009_git_contest_init_spec.rb

@@ -3,44 +3,18 @@ require "spec_helper"
 # Don't forget --defaults option
 
 describe "T009: git-contest-init" do
-
-  before do
-    init_env
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t009"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-    # debug_on
-  end
-
-  after do
-    Dir.chdir '..'
-    Dir.rmdir @test_dir
-  end
-
-  describe "001: --force" do
-    before do
-      Dir.mkdir "001"
-      Dir.chdir "001"
-    end
-
-    after do
-      FileUtils.remove_dir ".git", :force => true
-      Dir.chdir ".."
-      Dir.rmdir "001"
-    end
-
+  context "A001: --force" do
     it "001: init -> init" do
       ret1 = bin_exec "init --defaults"
       ret_config1 = git_do("config --get git.contest.branch.master")
       ret2 = bin_exec "init --defaults"
-
       ret_config1.should                                           === "master"
-      ret1.include?("Error: unknown argument").should              === false
-      ret2.include?("Error: unknown argument").should              === false
-      ret1.include?("Already initialized for git-contest.").should === false
-      ret1.include?("use: git contest init -f").should             === false
-      ret2.include?("Already initialized for git-contest.").should === true
-      ret2.include?("use: git contest init -f").should             === true
+      expect(ret1).not_to include "Error: unknown argument"
+      expect(ret2).not_to include "Error: unknown argument"
+      expect(ret1).not_to include "Already initialized for git-contest."
+      expect(ret1).not_to include "use: git contest init -f"
+      expect(ret2).to include "Already initialized for git-contest."
+      expect(ret2).to include "use: git contest init -f"
     end
 
     it "002: init -> init -f -> init --force" do
@@ -49,15 +23,15 @@ describe "T009: git-contest-init" do
       ret2 = bin_exec "init --defaults -f"
       ret3 = bin_exec "init --defaults --force"
       ret_config1.should === "master"
-      ret1.include?("Error: unknown argument").should              === false
-      ret2.include?("Error: unknown argument").should              === false
-      ret3.include?("Error: unknown argument").should              === false
-      ret1.include?("Already initialized for git-contest.").should === false
-      ret1.include?("use: git contest init -f").should             === false
-      ret2.include?("Already initialized for git-contest.").should === false
-      ret2.include?("use: git contest init -f").should             === false
-      ret3.include?("Already initialized for git-contest.").should === false
-      ret3.include?("use: git contest init -f").should             === false
+      expect(ret1).not_to include "Error: unknown argument"
+      expect(ret2).not_to include "Error: unknown argument"
+      expect(ret3).not_to include "Error: unknown argument"
+      expect(ret1).not_to include "Already initialized for git-contest."
+      expect(ret1).not_to include "use: git contest init -f"
+      expect(ret2).not_to include "Already initialized for git-contest."
+      expect(ret2).not_to include "use: git contest init -f"
+      expect(ret3).not_to include "Already initialized for git-contest."
+      expect(ret3).not_to include "use: git contest init -f"
     end
 
     it "003: init -f -> init -f -> init --force" do
@@ -66,17 +40,16 @@ describe "T009: git-contest-init" do
       ret2 = bin_exec "init --defaults -f"
       ret3 = bin_exec "init --defaults --force"
       ret_config1.should                                           === "master"
-      ret1.include?("Error: unknown argument").should              === false
-      ret2.include?("Error: unknown argument").should              === false
-      ret3.include?("Error: unknown argument").should              === false
-      ret1.include?("Already initialized for git-contest.").should === false
-      ret1.include?("use: git contest init -f").should             === false
-      ret2.include?("Already initialized for git-contest.").should === false
-      ret2.include?("use: git contest init -f").should             === false
-      ret3.include?("Already initialized for git-contest.").should === false
-      ret3.include?("use: git contest init -f").should             === false
+      expect(ret1).not_to include "Error: unknown argument"
+      expect(ret2).not_to include "Error: unknown argument"
+      expect(ret3).not_to include "Error: unknown argument"
+      expect(ret1).not_to include "Already initialized for git-contest."
+      expect(ret1).not_to include "use: git contest init -f"
+      expect(ret2).not_to include "Already initialized for git-contest."
+      expect(ret2).not_to include "use: git contest init -f"
+      expect(ret3).not_to include "Already initialized for git-contest."
+      expect(ret3).not_to include "use: git contest init -f"
     end
   end
-
 end