learn-test 3.3.0.pre.1 → 3.3.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8068b9ca6cd44a8bea55fbe7aff5ec5ee08f811e171021726a6e6364c250a210
-  data.tar.gz: 2e6ab893c0f4492cae089cb0c08f836a56486c5d3d3a1140cdf7b4172dc6fbff
+  metadata.gz: 7906a9d22e49996f18bf0b8c0cd1c7d76f5ef27447ee235b09403c58b6132340
+  data.tar.gz: 98f97cbd9e8d2b0bd643ff95e9e6f5ec11988a74a4e1a17819d303cbb2b9bba8
 SHA512:
-  metadata.gz: e409f578b4721d75066dc5430d7c725ca47df693487b1cda69149ba4db5d3ca0e7ae33e61e57150ec43c2aaeb1c3e03e5b66ee1d0ddbf281b3c26b8f423aa087
-  data.tar.gz: 4a05f33e6601662c068f6d10fb9d225c68f0d60b1edb90dcf195271f4594c426bcf80e99fb987fc49cc69d7f8e723be2fc16f16d4b467f10cd0af103dd043260
+  metadata.gz: 6ded3c645f8ae0ef2f7a2ab4cf39819b42f6c82a5a93e7876ad2ab625199d033a311fbbff03adf736a6ac64cbb655ae03eb35147abeca20ee13a59efe6979453
+  data.tar.gz: d41f77188f4fb422e216d0d808ab817d7a3ec915ca12376f62cdbecb39384e5256b100b4135869cb8e3e3dc4b4aeb2d52eee1ef24369fcf7a3466be130587df5

data/lib/learn_test.rb

@@ -8,7 +8,9 @@ require 'zeitwerk'
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect(
   'csharp' => 'CSharp',
-  'csharp_nunit' => 'CSharpNunit'
+  'csharp_nunit' => 'CSharpNunit',
+  'nodejs' => 'NodeJS',
+  'phantomjs' => 'PhantomJS'
 )
 loader.setup
 

data/lib/learn_test/git/wip/base.rb

@@ -10,7 +10,6 @@ module LearnTest
     module Wip
       class Base < ::Git::Path
         TEMPFILE = '.wip'
-        PREFIX = 'refs/wip/'
 
         attr_reader :working_branch, :wip_branch
 
@@ -21,11 +20,11 @@ module LearnTest
 
           current_branch = @base.current_branch
 
-          raise NoCommitsError, 'master' if current_branch.nil? # TODO: Swap to `main`?
+          raise Errors::NoCommitsError, 'master' if current_branch.nil? # TODO: Swap to `main`?
 
           @tmp = Tempfile.new(TEMPFILE)
           @working_branch = Branch.new(base: @base, name: current_branch)
-          @wip_branch = Branch.new(base: @base, name: "#{PREFIX}#{current_branch}")
+          @wip_branch = Reference.new(base: @base, name: current_branch)
         end
 
         def process!
@@ -44,9 +43,6 @@ module LearnTest
           new_tree = build_new_tree(@wip_branch.parent)
           @base.diff(new_tree, @wip_branch.parent)
 
-          # tree_diff = @base.diff(new_tree, @wip_branch.parent)
-          # raise NoChangesError, @wip_branch if tree_diff.count.zero?
-
           commit = @base.commit_tree(new_tree, parent: @wip_branch.parent)
 
           @base.lib.send(:command, 'update-ref', ['-m', @message, @wip_branch, commit.objectish])

data/lib/learn_test/git/wip/branch.rb

@@ -16,11 +16,13 @@ module LearnTest
             begin
               @base.revparse(@name)
             rescue ::Git::GitExecuteError => e
+              regex = Errors::NoCommitsError::REGEX
+
               if raise_no_commits
-                raise e.message.match(NoCommitsError::REGEX) ? NoCommitsError.new(@name) : e
+                raise e.message.match(regex) ? Errors::NoCommitsError.new(@name) : e
               end
 
-              raise unless e.message.match(NoCommitsError::REGEX)
+              raise unless e.message.match(regex)
 
               false
             end

data/lib/learn_test/git/wip/errors/base_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Git
+    module Wip
+      module Errors
+        class BaseError < StandardError; end
+      end
+    end
+  end
+end

data/lib/learn_test/git/wip/errors/no_changes_error.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Git
+    module Wip
+      module Errors
+        class NoChangesError < BaseError
+          def initialize(branch)
+            super "No changes found on `#{branch}`"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/git/wip/errors/no_commits_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Git
+    module Wip
+      module Errors
+        class NoCommitsError < BaseError
+          REGEX = /unknown revision or path not in the working tree/i.freeze
+
+          def initialize(branch)
+            super "Branch `#{branch}` doesn't have any commits. Please commit and try again."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/git/wip/reference.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module LearnTest
+  module Git
+    module Wip
+      class Reference < Branch
+        attr_accessor :parent
+
+        PREFIX = 'refs/wip/'
+
+        def initialize(base:, name:)
+          dir = File.join(base.repo.path, PREFIX)
+          file = File.join(dir, name)
+          sha = base.log(1)[0].sha
+
+          FileUtils.mkdir_p(dir, { mode: 0755 }) unless Dir.exist?(dir)
+          File.open(file, 'w+') { |f| f.puts sha } unless File.exist?(file)
+
+          super(base: base, name: "#{PREFIX}#{name}")
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/reporter.rb

@@ -68,7 +68,7 @@ module LearnTest
         repo.push('origin', "#{res.wip_branch}:refs/heads/fis-wip", { force: true })
       rescue ::Git::GitExecuteError => e
         if @debug
-          puts 'There was a problem connecting to Github. Not pushing current branch state.'.red
+          puts 'There was a problem connecting to GitHub. Not pushing current branch state.'.red
           puts e.message
         end
       end

data/lib/learn_test/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LearnTest
-  VERSION = '3.3.0.pre.1'
+  VERSION = '3.3.0.pre.6'
 end

data/spec/features/rspec_unit_spec.rb

@@ -12,9 +12,10 @@ describe 'Running a RSpec Unit Test', type: :aruba do
   before :each do
     copy '%/rspec-unit-spec', 'example'
     cd 'example'
-    run_command_and_stop 'git init'
-    run_command_and_stop 'git add .'
-    run_command_and_stop 'git commit -m "Initial Commit"'
+
+    git_init
+    git_add
+    git_commit 'Initial Commit'
   end
 
   def run(flags = '')

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

@@ -31,27 +31,32 @@ describe LearnTest::Git::Wip::Base do
       create_directory 'example'
       cd 'example'
       write_file 'README.md', 'Hello World'
-      run_command_and_stop 'git init'
+      git_init
 
       if commit # rubocop:disable Style/GuardClause
-        run_command_and_stop 'git add .'
-        run_command_and_stop 'git commit -m "Initial Commit"'
+        git_add
+        git_commit 'Initial Commit'
       end
     end
 
-    context 'no commits' do
-      before(:each) { initialize_repo(commit: false) }
+    context 'no refs/wip' do
+      before(:each) { initialize_repo }
 
-      it 'should raise' do
-        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoCommitsError)
+      it 'should create refs/wip' do
+        expect(FileUtils)
+          .to receive(:mkdir_p)
+          .with("#{path}/.git/refs/wip/", { mode: 0755 })
+          .and_call_original
+
+        instance.process!
       end
     end
 
-    xcontext 'no changes' do
-      before(:each) { initialize_repo }
+    context 'no commits' do
+      before(:each) { initialize_repo(commit: false) }
 
       it 'should raise' do
-        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoChangesError)
+        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::Errors::NoCommitsError)
       end
     end
 
@@ -74,8 +79,8 @@ describe LearnTest::Git::Wip::Base do
           initialize_repo
           write_file 'test.rb', ''
 
-          run_command_and_stop 'git add .'
-          run_command_and_stop 'git commit -m "foo"'
+          git_add
+          git_commit 'foo'
         end
 
         it 'should process successfully' do

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

@@ -91,7 +91,7 @@ describe LearnTest::Git::Wip::Branch do
         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."
+          LearnTest::Git::Wip::Errors::NoCommitsError, "Branch `#{name}` doesn't have any commits. Please commit and try again."
         )
       end
     end

data/spec/learn_test/git/wip/errors/base_error_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Errors::BaseError do
+  it 'should inherit from StandardError' do
+    expect(described_class).to be < StandardError
+  end
+end

data/spec/learn_test/git/wip/errors/no_changes_error_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Errors::NoChangesError do
+  let(:branch) { rand(0..999_999).to_s }
+
+  it 'should inherit from Error' do
+    expect(described_class).to be < LearnTest::Git::Wip::Errors::BaseError
+  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

data/spec/learn_test/git/wip/errors/no_commits_error_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Errors::NoCommitsError do
+  let(:branch) { rand(0..999_999).to_s }
+
+  it 'should inherit from Error' do
+    expect(described_class).to be < LearnTest::Git::Wip::Errors::BaseError
+  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

data/spec/learn_test/reporter_spec.rb

@@ -96,6 +96,20 @@ describe LearnTest::Reporter do
     end
 
     it 'posts results to the service endpoint' do
+      branch = double(LearnTest::Git::Wip::Branch)
+      branch_name = 'bar'
+
+      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
 
       expect(client).to have_received(:post_results)

data/spec/spec_helper.rb

@@ -8,7 +8,12 @@ SimpleCov.start
 
 require_relative '../lib/learn_test'
 
+support_dir = File.join('./', 'spec', 'support', '**', '*.rb')
+Dir.glob(support_dir).each { |f| require f }
+
 RSpec.configure do |config|
+  config.filter_run focus: true
+
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end

data/spec/support/git.rb

@@ -0,0 +1,17 @@
+def git_set_user
+ run_command_and_stop 'git config user.email "info@flatironschool.com"'
+ run_command_and_stop 'git config user.name "Flatiron School"'
+end
+
+def git_init
+  run_command_and_stop 'git init'
+  git_set_user
+end
+
+def git_add(files = '.')
+  run_command_and_stop "git add #{files}"
+end
+
+def git_commit(msg)
+  run_command_and_stop "git commit -m \"#{msg}\""
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre.1
+  version: 3.3.0.pre.6
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,7 +184,10 @@ files:
 - lib/learn_test/git.rb
 - lib/learn_test/git/wip/base.rb
 - lib/learn_test/git/wip/branch.rb
-- lib/learn_test/git/wip/error.rb
+- lib/learn_test/git/wip/errors/base_error.rb
+- lib/learn_test/git/wip/errors/no_changes_error.rb
+- lib/learn_test/git/wip/errors/no_commits_error.rb
+- lib/learn_test/git/wip/reference.rb
 - lib/learn_test/github_interactor.rb
 - lib/learn_test/js_strategy.rb
 - lib/learn_test/learn_oauth_token_parser.rb
@@ -220,7 +223,9 @@ files:
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/learn_test/git/wip/base_spec.rb
 - spec/learn_test/git/wip/branch_spec.rb
-- spec/learn_test/git/wip/error_spec.rb
+- spec/learn_test/git/wip/errors/base_error_spec.rb
+- spec/learn_test/git/wip/errors/no_changes_error_spec.rb
+- spec/learn_test/git/wip/errors/no_commits_error_spec.rb
 - spec/learn_test/git_spec.rb
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
@@ -228,6 +233,7 @@ files:
 - spec/lib/learn_test/strategies/none_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/git.rb
 homepage: https://github.com/learn-co/learn-test
 licenses:
 - MIT
@@ -263,7 +269,9 @@ test_files:
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/learn_test/git/wip/base_spec.rb
 - spec/learn_test/git/wip/branch_spec.rb
-- spec/learn_test/git/wip/error_spec.rb
+- spec/learn_test/git/wip/errors/base_error_spec.rb
+- spec/learn_test/git/wip/errors/no_changes_error_spec.rb
+- spec/learn_test/git/wip/errors/no_commits_error_spec.rb
 - spec/learn_test/git_spec.rb
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
@@ -271,3 +279,4 @@ test_files:
 - spec/lib/learn_test/strategies/none_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/git.rb

data/lib/learn_test/git/wip/error.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module LearnTest
-  module Git
-    module Wip
-      class Error < StandardError; end
-
-      class NoChangesError < Error
-        def initialize(branch)
-          super "No changes found on `#{branch}`"
-        end
-      end
-
-      class NoCommitsError < Error
-        REGEX = /unknown revision or path not in the working tree/i.freeze
-
-        def initialize(branch)
-          super "Branch `#{branch}` doesn't have any commits. Please commit and try again."
-        end
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-# 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