learn-test 2.5.6 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53ebce05a6ed7c4c7cb3e41c7b613450854be494
-  data.tar.gz: c6f35a2b5ffd314d8e3b5815c349fe384518a403
+SHA256:
+  metadata.gz: cc7eb81e50945d683e8bb07870e1160c8ec269927106fd8f50d921cc71034002
+  data.tar.gz: ca2bb24e7603d0d6649ebb472568c2dcae6050f0f9ce9894c871ba53ca71ce46
 SHA512:
-  metadata.gz: 7fa014a21fcc8f4acc418eae9612014a1266250c796e54076f5e971da98859f782cdde4009e365648b76a941e03f2f8c8e2e3bacbd19ef8d49c98d9f449d4c50
-  data.tar.gz: eaf80dd6b238fa32525d413070907b5bf35b9c3b17013f18b596bf7cfa22a3f52115c7b0436ed2aaedc1751341800c2fabafd70553e00e8f4229c953ce7225bd
+  metadata.gz: e141cae46336820ddd5ce0114b84d52c4541af809bc89a9be402935ab1adef08db72be596b407d4bbf7c6b1fc92e15e31ad8e357af2dd98c97e3bdc6f7f635c0
+  data.tar.gz: 30400f93167d9db8e2138830618a29635c6edb9ed600a0e1ddf9212f52c30e3da3d09cbccf02893b208f1b2ae3f0fdbcffcfc5402499a52d7d651042162ebb90

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Flatiron School
+Copyright (c) 2014-2018 Flatiron School
 
 MIT License
 

data/README.md

@@ -1,6 +1,6 @@
 # learn-test
 
-Runs RSpec, Jasmine, and Python Unit Test test suites and uploads the results to Learn.
+Runs RSpec, Jasmine, and Python Pytest test suites and uploads the results to Learn.
 
 ## Installation
 
@@ -22,7 +22,7 @@ And then execute:
 
 ## Usage
 
-From within a directory with an RSpec, Jasmine, Karma, Mocha, or Python Unit Test test suite, run:
+From within a directory with an RSpec, Jasmine, Karma, Mocha, or Python Pytest test suite, run:
 
 ```
 $ learn-test
@@ -35,4 +35,3 @@ $ learn-test
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
-

data/learn-test.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = LearnTest::VERSION
   spec.authors       = ["Flatiron School"]
   spec.email         = ["learn@flatironschool.com"]
-  spec.summary       = %q{Runs RSpec, Jasmine, Karma, Mocha, and Python Unit Test builds and pushes JSON output to Learn.}
+  spec.summary       = %q{Runs RSpec, Jasmine, Karma, Mocha, and Python Pytest Test builds and pushes JSON output to Learn.}
   spec.homepage      = "https://github.com/learn-co/learn-test"
   spec.license       = "MIT"
 

data/lib/learn_test.rb

@@ -17,7 +17,6 @@ require_relative 'learn_test/dependency'
 require_relative 'learn_test/strategy'
 require_relative 'learn_test/js_strategy'
 require_relative 'learn_test/strategies/jasmine'
-require_relative 'learn_test/strategies/python_unittest'
 require_relative 'learn_test/strategies/rspec'
 require_relative 'learn_test/strategies/karma'
 require_relative 'learn_test/strategies/protractor'
@@ -25,6 +24,7 @@ require_relative 'learn_test/strategies/java_junit'
 require_relative 'learn_test/strategies/csharp_nunit'
 require_relative 'learn_test/strategies/mocha'
 require_relative 'learn_test/strategies/green_onion'
+require_relative 'learn_test/strategies/pytest'
 
 module LearnTest
   module Dependencies
@@ -39,5 +39,6 @@ module LearnTest
     autoload :SeleniumServer, 'learn_test/dependencies/selenium_server'
     autoload :Firefox,        'learn_test/dependencies/firefox'
     autoload :GreenOnion,     'learn_test/dependencies/green_onion'
+    autoload :Pytest,         'learn_test/dependencies/pytest'
   end
 end

data/lib/learn_test/js_strategy.rb

@@ -8,11 +8,15 @@ module LearnTest
       [:dependencies, :devDependencies].any? { |key| js_package[key] && js_package[key][dep] }
     end
 
+    def modules_missing?(module_names)
+      module_names.any? { |name| !File.exist?("node_modules/#{name}") }
+    end
+
     def missing_dependencies?
       return true if !File.exist?("node_modules")
-
-      [:dependencies, :devDependencies, :peerDependencies].any? do |d|
-        (js_package[d] || {}).any? { |p, v| !File.exist?("node_modules/#{p}") }
+      [:dependencies, :devDependencies, :peerDependencies].any? do |dep_group|
+        modules = js_package[dep_group] || {}
+        modules_missing?(modules.keys)
       end
     end
 

data/lib/learn_test/runner.rb

@@ -57,7 +57,7 @@ module LearnTest
         LearnTest::Strategies::Protractor,
         LearnTest::Strategies::JavaJunit,
         LearnTest::Strategies::Mocha,
-        LearnTest::Strategies::PythonUnittest,
+        LearnTest::Strategies::Pytest,
       ]
     end
 

data/lib/learn_test/strategies/pytest.rb

@@ -0,0 +1,80 @@
+require 'crack'
+require_relative 'pytest/requirements_checker'
+
+module LearnTest
+  module Strategies
+    class Pytest < LearnTest::Strategy
+
+      def service_endpoint
+        '/e/flatiron_pytest'
+      end
+
+      def detect
+        test_files.count > 0
+      end
+
+      def check_dependencies
+        LearnTest::Pytest::RequirementsChecker.check_installation
+      end
+
+      def run
+        system("python -m pytest #{options[:argv].join(' ')} --junitxml='./.results.xml'")
+      end
+
+      def output
+        @output ||= Crack::XML.parse(File.read('.results.xml'))["testsuite"]
+      end
+
+      def test_files
+        # pytest will run all files of the form test_*.py or *_test.py
+        @test_files ||= Dir.glob("**/test_*.py") + Dir.glob("**/*_test.py")
+      end
+
+      def results
+        failed_count = output["failures"].to_i + output["errors"].to_i
+        skipped_count = output["skips"].to_i
+        passed_count = output["tests"].to_i - failed_count - skipped_count
+        {
+          username: username,
+          github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
+          repo_name: runner.repo,
+          build: {
+            test_suite: [{
+              framework: 'pytest',
+              formatted_output: output.to_json,
+              duration: output["time"]
+            }]
+          },
+          examples: output["tests"].to_i,
+          passing_count: passed_count,
+          pending_count: skipped_count,
+          failure_count: failed_count,
+          failure_descriptions: concat_failure_descriptions
+        }
+      end
+
+      def cleanup
+        FileUtils.rm('.results.xml')
+      end
+
+      private
+
+      def calculate_duration
+        output[:results].map do |example|
+          example[:time]
+        end.inject(:+)
+      end
+
+      def concat_failure_descriptions
+        output["testcase"].reduce([]) do |errors, example|
+          if example.has_key?("failure")
+            errors << example.map{|k, v| "#{k}: #{v}"}
+          end
+          errors
+        end
+      end
+
+    end
+  end
+end

data/lib/learn_test/strategies/{python_unittest → pytest}/requirements_checker.rb

@@ -1,35 +1,28 @@
 require 'open3'
 
 module LearnTest
-  module PythonUnittest
+  module Pytest
     class RequirementsChecker
       def self.check_installation
-        new.check_installation
-      end
-
-      def check_installation
         PythonChecker.check
         PipChecker.check
+        PytestChecker.check
       end
     end
 
     class PythonChecker
       def self.check
-        new.check
-      end
-
-      def check
-        if !python_installed? || !correct_python_version?
+        if !self.python_installed? || !self.correct_python_version?
           puts "Please install python 2.7.x or 3.x.x"
           exit
         end
       end
 
-      def python_installed?
+      def self.python_installed?
         !`which python`.empty?
       end
 
-      def correct_python_version?
+      def self.correct_python_version?
         output = Open3.popen2e('python', '--version')
         version = output[1].read.strip
         !!version.match(/ 2.7.*| 3.*/)
@@ -38,20 +31,29 @@ module LearnTest
 
     class PipChecker
       def self.check
-        new.check
-      end
-
-      def check
-        if !pip_installed?
+        if !self.pip_installed?
           puts "Please ensure pip is installed"
           exit
         end
       end
 
-      def pip_installed?
+      def self.pip_installed?
         !`which pip`.empty?
       end
     end
+
+    class PytestChecker
+      def self.check
+        if !self.pytest_installed?
+          puts "Please ensure pytest is installed"
+          exit
+        end
+      end
+
+      def self.pytest_installed?
+        !`which pytest`.empty?
+      end
+    end
+
   end
 end
-

data/lib/learn_test/version.rb

@@ -1,3 +1,3 @@
 module LearnTest
-  VERSION = '2.5.6'
+  VERSION = '2.6.0'
 end

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

@@ -16,44 +16,47 @@ describe LearnTest::Strategies::Mocha do
         }
       }
     end
+
     let(:runner) { double("Runner", options: {}) }
     let(:strategy) { LearnTest::Strategies::Mocha.new(runner) }
 
-    it "returns true if no node_modules directory" do
-      expect(File).to receive(:exists?).with("node_modules") { false }
-
-      expect(strategy.missing_dependencies?(package)).to eq(true)
+    context "node_modules/ does not exist" do
+      it "returns true" do
+        allow(File).to receive(:exist?).with("node_modules").and_return(false)
+        expect(strategy.missing_dependencies?).to eq(true)
+      end
     end
 
-    context "node_modules exists" do
+
+    context "node_modules/ exists" do
       before(:each) do
-        allow(File).to receive(:exists?) { true }
+        allow(File).to receive(:exist?).and_return(true)
+        allow(strategy).to receive(:js_package).and_return(package)
       end
 
       it "returns true if missing a dependency" do
-        expect(File).to receive(:exists?).with("node_modules/dep1") { true }
-        expect(File).to receive(:exists?).with("node_modules/dep2") { false }
-        expect(strategy.missing_dependencies?(package)).to eq(true)
+        allow(File).to receive(:exist?).with("node_modules/dep2").and_return(false)
+        expect(strategy.missing_dependencies?).to eq(true)
       end
 
       it "returns true if missing a devDependency" do
-        expect(File).to receive(:exists?).with("node_modules/devDep1") { true }
-        expect(File).to receive(:exists?).with("node_modules/devDep2") { false }
-        expect(strategy.missing_dependencies?(package)).to eq(true)
+        allow(File).to receive(:exist?).with("node_modules/devDep2").and_return(false)
+        expect(strategy.missing_dependencies?).to eq(true)
       end
 
       it "returns true if missing a peerDependency" do
-        expect(File).to receive(:exists?).with("node_modules/peerDep1") { true }
-        expect(File).to receive(:exists?).with("node_modules/peerDep2") { false }
-        expect(strategy.missing_dependencies?(package)).to eq(true)
+        allow(File).to receive(:exist?).with("node_modules/peerDep2").and_return(false)
+        expect(strategy.missing_dependencies?).to eq(true)
       end
 
       it "returns false if missing no dependencies" do
-        expect(strategy.missing_dependencies?(package)).to eq(false)
+        allow(File).to receive(:exist?).and_return(true)
+        expect(strategy.missing_dependencies?).to eq(false)
       end
 
       it "returns false if there are no dependencies" do
-        expect(strategy.missing_dependencies?({})).to eq(false)
+        allow(strategy).to receive(:js_package).and_return({})
+        expect(strategy.missing_dependencies?).to eq(false)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.6.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -289,9 +289,8 @@ files:
 - lib/learn_test/strategies/karma/karma.conf.js
 - lib/learn_test/strategies/mocha.rb
 - lib/learn_test/strategies/protractor.rb
-- lib/learn_test/strategies/python_unittest.rb
-- lib/learn_test/strategies/python_unittest/nose_installer.rb
-- lib/learn_test/strategies/python_unittest/requirements_checker.rb
+- lib/learn_test/strategies/pytest.rb
+- lib/learn_test/strategies/pytest/requirements_checker.rb
 - lib/learn_test/strategies/rspec.rb
 - lib/learn_test/strategy.rb
 - lib/learn_test/user_id_parser.rb
@@ -336,10 +335,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Runs RSpec, Jasmine, Karma, Mocha, and Python Unit Test builds and pushes
+summary: Runs RSpec, Jasmine, Karma, Mocha, and Python Pytest Test builds and pushes
   JSON output to Learn.
 test_files:
 - spec/features/jasmine_jquery_fixtures_spec.rb

data/lib/learn_test/strategies/python_unittest.rb

@@ -1,72 +0,0 @@
-require_relative 'python_unittest/requirements_checker'
-require_relative 'python_unittest/nose_installer'
-
-module LearnTest
-  module Strategies
-    class PythonUnittest < LearnTest::Strategy
-      def service_endpoint
-        '/e/flatiron_unittest'
-      end
-
-      def detect
-        test_files.any? {|f| f.match(/.*\.py$/) }
-      end
-
-      def check_dependencies
-        LearnTest::PythonUnittest::RequirementsChecker.check_installation
-        LearnTest::PythonUnittest::NoseInstaller.install
-      end
-
-      def run
-        system("nosetests #{options[:argv].join(' ')} --verbose --with-json --json-file='./.results.json'")
-      end
-
-      def output
-        @output ||= Oj.load(File.read('.results.json'), symbol_keys: true)
-      end
-
-      def test_files
-        @test_files ||= Dir.glob("**/*_test.py")
-      end
-
-      def results
-        {
-          username: username,
-          github_user_id: user_id,
-          learn_oauth_token: learn_oauth_token,
-          repo_name: runner.repo,
-          build: {
-            test_suite: [{
-              framework: 'unittest',
-              formatted_output: output,
-              duration: calculate_duration
-            }]
-          },
-          examples: output[:stats][:total],
-          passing_count: output[:stats][:passes],
-          pending_count: output[:stats][:skipped],
-          failure_count: output[:stats][:errors],
-          failure_descriptions: concat_failure_descriptions
-        }
-      end
-
-      def cleanup
-        FileUtils.rm('.results.json')
-      end
-
-      private
-
-      def calculate_duration
-        output[:results].map do |example|
-          example[:time]
-        end.inject(:+)
-      end
-
-      def concat_failure_descriptions
-        output[:results].select do |example|
-          example[:type] == 'failure'
-        end.map { |ex| ex[:tb] }.join(';')
-      end
-    end
-  end
-end

data/lib/learn_test/strategies/python_unittest/nose_installer.rb

@@ -1,35 +0,0 @@
-module LearnTest
-  module PythonUnittest
-    class NoseInstaller
-      def self.install
-        new.install
-      end
-
-      def install
-        install_nose
-        install_nose_json
-      end
-
-      def install_nose
-        if !nose_installed?
-          `easy_install nose`
-        end
-      end
-
-      def nose_installed?
-        !`which nosetests`.empty?
-      end
-
-      def install_nose_json
-        if !nose_json_installed?
-          `pip install nose-json`
-        end
-      end
-
-      def nose_json_installed?
-        !`pip show nose-json`.empty?
-      end
-    end
-  end
-end
-