learn-test 3.2.4 → 3.3.0.pre.1

data/spec/learn_test/git/wip/base_spec.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Base do
+  describe 'attr_reader' do
+    let(:base) { LearnTest::Git::Base.open('./') }
+    let(:message) { 'foobar' }
+    let(:instance) do
+      described_class.new(
+        base: base,
+        message: message
+      )
+    end
+
+    it 'should have :working_branch, :wip_branch' do
+      expect(instance).to respond_to(:working_branch, :wip_branch)
+    end
+  end
+
+  describe '.process!', type: :aruba do
+    let!(:path) { File.join Aruba.config.home_directory, 'example' }
+    let(:base) { LearnTest::Git::Base.open(path) }
+    let(:message) { 'foobar' }
+    let(:instance) do
+      described_class.new(
+        base: base,
+        message: message
+      )
+    end
+
+    def initialize_repo(commit: true)
+      create_directory 'example'
+      cd 'example'
+      write_file 'README.md', 'Hello World'
+      run_command_and_stop 'git init'
+
+      if commit # rubocop:disable Style/GuardClause
+        run_command_and_stop 'git add .'
+        run_command_and_stop 'git commit -m "Initial Commit"'
+      end
+    end
+
+    context 'no commits' do
+      before(:each) { initialize_repo(commit: false) }
+
+      it 'should raise' do
+        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoCommitsError)
+      end
+    end
+
+    xcontext 'no changes' do
+      before(:each) { initialize_repo }
+
+      it 'should raise' do
+        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoChangesError)
+      end
+    end
+
+    context 'changes' do
+      context 'staged' do
+        before :each do
+          initialize_repo
+          write_file 'test.rb', ''
+        end
+
+        it 'should process successfully' do
+          instance.process!
+
+          expect(instance.success?).to eq(true)
+        end
+      end
+
+      context 'committed' do
+        before :each do
+          initialize_repo
+          write_file 'test.rb', ''
+
+          run_command_and_stop 'git add .'
+          run_command_and_stop 'git commit -m "foo"'
+        end
+
+        it 'should process successfully' do
+          instance.process!
+
+          expect(instance.success?).to eq(true)
+        end
+      end
+    end
+  end
+end

data/spec/learn_test/git/wip/branch_spec.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Branch do
+  let(:base) { LearnTest::Git::Base.open('./') }
+  let(:name) { base.current_branch }
+  let(:branch) do
+    described_class.new(
+      base: base,
+      name: name
+    )
+  end
+
+  let(:sha1) { Digest::SHA1.new.hexdigest }
+  let(:nothing_to_commit_error_msg) { 'nothing to commit, working directory clean' }
+  let(:no_commits_error_msg) do
+    "fatal: ambiguous argument '#{name}': unknown revision or path not in the working tree."
+  end
+
+  describe 'accessors' do
+    it 'should have :parent, :parent=' do
+      expect(branch).to respond_to(:parent, :parent=)
+    end
+  end
+
+  describe '.new' do
+    it 'should require :base' do
+      expect { described_class.new(base: {}) }.to raise_error(ArgumentError, /name/)
+    end
+
+    it 'should require :name' do
+      expect { described_class.new(name: 'foo') }.to raise_error(ArgumentError, /base/)
+    end
+  end
+
+  describe '.to_s' do
+    it 'should return @name' do
+      expect(branch.to_s).to eq(name)
+    end
+  end
+
+  describe '.last_revision' do
+    context 'success' do
+      it 'should return a SHA' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_return(sha1)
+
+        expect(branch.last_revision).to eq(sha1)
+      end
+
+      it 'should only run revparse once' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_return(sha1)
+          .once
+
+        expect(branch.last_revision).to eq(sha1)
+        expect(branch.last_revision).to eq(sha1)
+      end
+    end
+
+    context 'hide expected Git errors' do
+      it 'should hide no commits error' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_raise(::Git::GitExecuteError, no_commits_error_msg)
+
+        expect { branch.last_revision }.to_not raise_error
+      end
+
+      it 'should return false' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_raise(::Git::GitExecuteError, no_commits_error_msg)
+
+        expect(branch.last_revision).to eq(false)
+      end
+    end
+
+    context 'raise expected Git errors' do
+      it 'should raise no commits error' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_raise(::Git::GitExecuteError, no_commits_error_msg)
+
+        expect do
+          branch.last_revision(raise_no_commits: true)
+        end.to raise_error(
+          LearnTest::Git::Wip::NoCommitsError, "Branch `#{name}` doesn't have any commits. Please commit and try again."
+        )
+      end
+    end
+
+    context 'raise unexpected Git errors' do
+      it 'should raise no commits error' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_raise(::Git::GitExecuteError, nothing_to_commit_error_msg)
+
+        expect { branch.last_revision }.to raise_error(::Git::GitExecuteError, nothing_to_commit_error_msg)
+      end
+    end
+
+    context 'raise unexpected errors' do
+      it 'should raise' do
+        expect(base)
+          .to receive(:revparse)
+          .with(name)
+          .and_raise(StandardError)
+
+        expect { branch.last_revision }.to raise_error(StandardError)
+      end
+    end
+  end
+end

data/spec/learn_test/git/wip/error_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip do
+  let(:branch) { rand(0..999_999).to_s }
+
+  describe LearnTest::Git::Wip::Error do
+    it 'should inherit from StandardError' do
+      expect(described_class).to be < StandardError
+    end
+  end
+
+  describe LearnTest::Git::Wip::NoChangesError do
+    it 'should inherit from Error' do
+      expect(described_class).to be < LearnTest::Git::Wip::Error
+    end
+
+    it 'should require a branch' do
+      expect { described_class.new }.to raise_error(ArgumentError)
+    end
+
+    it 'should have the correct messaging' do
+      error = described_class.new(branch)
+      expect(error.message).to eq "No changes found on `#{branch}`"
+    end
+  end
+
+  describe LearnTest::Git::Wip::NoCommitsError do
+    it 'should inherit from Error' do
+      expect(described_class).to be < LearnTest::Git::Wip::Error
+    end
+
+    it 'should require a branch' do
+      expect { described_class.new }.to raise_error(ArgumentError)
+    end
+
+    it 'should have the correct messaging' do
+      error = described_class.new(branch)
+      expect(error.message).to eq "Branch `#{branch}` doesn't have any commits. Please commit and try again."
+    end
+  end
+end

data/spec/learn_test/git_spec.rb

@@ -1,47 +1,53 @@
 # frozen_string_literal: true
 
-describe LearnTest::GitWip do
-  subject { described_class }
-
-  let!(:working_branch) { 'develop' }
-  let!(:git_url) { 'https://github.com/learn-co/learn-test' }
-  let!(:git_base) { instance_double(Git::Base) }
-
-  let(:wait_thr) { double }
-  let(:wait_thr_value) { double }
-  let(:stdout_and_stderr) { double }
-
-  context 'success' do
-    it 'should return the git url' do
-      expect(Git::Base).to receive(:open).with('./', { log: false }).and_return(git_base)
-      expect(git_base).to receive(:current_branch).and_return(working_branch)
+describe LearnTest::Git do
+  describe '.open' do
+    context 'defaults' do
+      it 'should instantiate LearnTest::Git::Base' do
+        expect(LearnTest::Git::Base).to receive(:open).with('./', {})
+        LearnTest::Git.open
+      end
+    end
 
-      expect(wait_thr).to receive(:value).and_return(wait_thr_value)
-      expect(wait_thr_value).to receive(:exitstatus).and_return(0)
+    context 'with options' do
+      it 'should instantiate LearnTest::Git::Base' do
+        directory = './foo'
+        options = { logger: false }
 
-      expect(Open3).to receive(:popen3).and_yield(nil, nil, nil, wait_thr)
+        expect(LearnTest::Git::Base).to receive(:open).with(directory, options)
 
-      expect(git_base).to receive_message_chain(:config, :[]).with('remote.origin.url').and_return("#{git_url}.git")
-      expect(subject.run!).to eq("#{git_url}/tree/wip")
+        LearnTest::Git.open(
+          directory: directory,
+          options: options
+        )
+      end
     end
   end
 
-  context 'failure' do
-    it 'should return false on process error' do
-      expect(Git::Base).to receive(:open).with('./', { log: false }).and_return(git_base)
-      expect(git_base).to receive(:current_branch).and_return(working_branch)
+  describe LearnTest::Git::Base do
+    it 'should inherit from ::Git::Base' do
+      expect(LearnTest::Git::Base).to be < ::Git::Base
+    end
 
-      expect(wait_thr).to receive(:value).and_return(wait_thr_value)
-      expect(wait_thr_value).to receive(:exitstatus).and_return(1)
+    describe '#wip' do
+      let!(:repo) { described_class.open('./') }
+      let!(:message) { 'FooBar' }
+      let!(:wip) { double(LearnTest::Git::Wip::Base) }
 
-      expect(Open3).to receive(:popen3).and_yield(nil, nil, nil, wait_thr)
+      it 'should require a :message' do
+        expect { repo.wip }.to raise_error(ArgumentError)
+      end
 
-      expect(subject.run!).to eq(false)
-    end
+      it 'should instantiate and run .process!' do
+        expect(LearnTest::Git::Wip::Base)
+          .to receive(:new)
+          .with(base: repo, message: message)
+          .and_return(wip)
+
+        expect(wip).to receive(:process!)
 
-    it 'should return false on StandardError' do
-      expect(Git::Base).to receive(:open).and_raise(StandardError)
-      expect(subject.run!).to eq(false)
+        expect(repo.wip(message: message)).to eq(wip)
+      end
     end
   end
 end

data/spec/learn_test/reporter_spec.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
-require_relative '../../lib/learn_test/reporter'
-
 require 'tempfile'
 require 'json'
 
 describe LearnTest::Reporter do
   let!(:client) { instance_spy(LearnTest::Client) }
-  let!(:git_tree) { 'https://github.com/learn-co/learn-test/tree/wip' }
+  let!(:git_base) { double(LearnTest::Git::Base) }
+  let!(:git_wip) { double(LearnTest::Git::Wip::Base) }
   let!(:strategy) do
     instance_spy(
       LearnTest::Strategy,
@@ -45,43 +42,62 @@ describe LearnTest::Reporter do
     end
 
     context 'sync with Github' do
-      it 'should not run LearnTest::GitWip, if :post_results fails' do
+      it 'should not run LearnTest::Git::Wip, if :post_results fails' do
         expect(client).to receive(:post_results).and_return(false)
-        expect(LearnTest::GitWip).to_not receive(:run!)
+        expect(LearnTest::Git).to_not receive(:open)
 
         reporter.report
       end
 
-      it 'should run LearnTest::GitWip.run!' do
+      it 'should run LearnTest::Git::Wip' do
+        branch = double(LearnTest::Git::Wip::Branch)
+        branch_name = 'foo'
+
         expect(client).to receive(:post_results).and_return(true)
-        expect(LearnTest::GitWip).to receive(:run!).and_return(:git_tree)
+        expect(LearnTest::Git).to receive(:open).and_return(git_base)
+        expect(git_base).to receive(:wip).and_return(git_wip)
+        expect(git_wip).to receive(:success?).and_return(true)
+
+        expect(branch).to receive(:to_s).and_return(branch_name)
+        expect(git_wip).to receive(:wip_branch).and_return(branch)
+
+        expect(git_base)
+          .to receive(:push)
+          .with('origin', "#{branch_name}:refs/heads/fis-wip", { force: true })
 
         reporter.report
       end
 
       it 'should not output an error message without debug' do
         expect(client).to receive(:post_results).and_return(true)
-        expect(LearnTest::GitWip).to receive(:run!).and_return(false)
+        expect(LearnTest::Git).to receive(:open).and_return(git_base)
+        expect(git_base).to receive(:wip).and_return(git_wip)
+        expect(git_wip).to receive(:success?).and_return(false)
+
+        expect(git_base).to_not receive(:push)
 
         expect { reporter.report }.to_not output.to_stdout
       end
 
       it 'should output an error message with debug' do
         expect(client).to receive(:post_results).and_return(true)
-        expect(LearnTest::GitWip).to receive(:run!).and_return(false)
+
+        expect(LearnTest::Git).to receive(:open).and_return(git_base)
+        expect(git_base).to receive(:wip).and_return(git_wip)
+        expect(git_wip).to receive(:success?).and_return(false)
+
+        expect(git_base).to_not receive(:push)
 
         expect do
           reporter.debug = true
           reporter.report
-        end.to output(/Github/i).to_stdout
+        end.to output(/There was a problem creating your WIP branch/i).to_stdout
       end
     end
 
     it 'posts results to the service endpoint' do
       reporter.report
 
-      allow(LearnTest::GitWip).to receive(:run!).and_return(:git_tree)
-
       expect(client).to have_received(:post_results)
         .with(strategy.service_endpoint, strategy.results)
     end
@@ -131,7 +147,6 @@ describe LearnTest::Reporter do
 
     it 'deletes the output file when all reports are sent successfully' do
       allow(client).to receive(:post_results).and_return(true)
-      allow(LearnTest::GitWip).to receive(:run!).and_return(:git_tree)
 
       reports = { hello: ['world'] }
 
@@ -145,7 +160,6 @@ describe LearnTest::Reporter do
 
     it 'writes the remaining reports from the output file' do
       allow(client).to receive(:post_results).and_return(true, false)
-      allow(LearnTest::GitWip).to receive(:run!).and_return(:git_tree)
 
       reports = { success: ['world'], failure: ['hello'] }
 

data/spec/lib/learn_test/strategies/none_spec.rb

@@ -34,7 +34,6 @@ describe LearnTest::Strategies::None do
       expect(LearnTest::LearnOauthTokenParser).to receive(:get_learn_oauth_token)
         .and_return(oauth_token)
 
-
       expect(strategy.results).to eq(
         username: username,
         github_user_id: user_id,