learn-test 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c5bde7cfc34f3b0a9f3001786b835a649065c9
-  data.tar.gz: 57f5fc7fa37b7ef4b6fd9344a37b970e0a332fb7
+  metadata.gz: d7a9b83439ba2bcc56e12b97b75f4b70a14ce9f0
+  data.tar.gz: f2d82adedacd4eda7ddb905eb37c08b568cbc44d
 SHA512:
-  metadata.gz: 7223234c5351485d9cbc2c4692d707f0f58bec9730f5d0b9838b1919fd8003d722026fe08c2bd77e378042898ee9ca9b0498191e34bdd79f9deb2424368fa871
-  data.tar.gz: 518c57425c6573cae03eb22d54058ed67235aaba3da5f6aac68b7aab7bb040235448735829ffeeb62a81cc341384fb176eaaa5ea70dd2789a33e8bb0318a7d85
+  metadata.gz: c0b30f556c64e9032a497bba4010b36024d58576777acf3f6383cf9398187f0beee0d450cd11ca1b4626bee085b022dab7744b6baf2eb5cd23d3506d2cb086af
+  data.tar.gz: d6ea1db7591ad07dce13e4a0db2124d346c9b49b3ad72a3e255ac0bfb8ab327bfdc971fbbde222643529c9c206843d2deaa821c6ed9239dbadf77f9a2ccfde97

data/lib/learn_test/runner.rb

@@ -15,8 +15,8 @@ module LearnTest
       strategy.run
       if !help_option_present? && strategy.push_results?
         push_results(strategy)
-        strategy.cleanup unless keep_results?
       end
+      strategy.cleanup unless keep_results?
     end
 
     def files

data/lib/learn_test/strategies/karma.rb

@@ -15,25 +15,11 @@ module LearnTest
       end
 
       def run
-        karma_config = LearnTest::FileFinder.location_to_dir('strategies/karma/karma.conf.js')
-
-        Open3.popen3("karma start #{karma_config}") do |stdin, stdout, stderr, wait_thr|
-          while out = stdout.gets do
-            puts out
-          end
-
-          while err = stderr.gets do
-            if err.include?('Cannot find local Karma!')
-              @missing_karma = true
-            end
-            puts err
-          end
-
-          if wait_thr.value.exitstatus != 0
-            if @missing_karma
-              die("You appear to be missing karma in your local node modules. Try running `npm install`.\nIf the issue persists, check if karma is specified as a dependency in the package.json.")
-            end
-          end
+        run_karma
+        if @missing_karma
+          puts "Installing local karma dependencies...".green
+          run_install('npm install')
+          run_karma
         end
       end
 
@@ -62,6 +48,29 @@ module LearnTest
       def cleanup
         FileUtils.rm('.results.json') if File.exist?('.results.json')
       end
+
+      private
+
+      def run_karma
+        karma_config = LearnTest::FileFinder.location_to_dir('strategies/karma/karma.conf.js')
+        Open3.popen3("karma start #{karma_config}") do |stdin, stdout, stderr, wait_thr|
+          while out = stdout.gets do
+            puts out
+          end
+
+          while err = stderr.gets do
+            if err.include?('Cannot find local Karma!')
+              die_missing_local_karma if @missing_karma
+              @missing_karma = true
+            end
+            puts err
+          end
+        end
+      end
+
+      def die_missing_local_karma
+        die("You appear to be missing karma in your local node modules. Try running `npm install`.\nIf the issue persists, make sure karma is specified as a dependency in the package.json")
+      end
     end
   end
 end

data/lib/learn_test/strategies/protractor.rb

@@ -17,6 +17,23 @@ module LearnTest
       end
 
       def run
+        if !selenium_running?
+          stdin, stdout, stderr, wait_thr = Open3.popen3('webdriver-manager start')
+          @pid = wait_thr.pid
+
+          @server_started = false
+
+          while !@server_started && line = stderr.gets do
+            puts line
+            if line.include?('Selenium Server is up and running')
+              @server_started = true
+              stdin.close
+              stdout.close
+              stderr.close
+            end
+          end
+        end
+
         Open3.popen3('protractor conf.js --resultJsonOutputFile .results.json') do |stdin, stdout, stderr, wait_thr|
           while line = stdout.gets do
             if line.include?('Error: Cannot find module')
@@ -26,22 +43,18 @@ module LearnTest
           end
 
           while stderr_line = stderr.gets do
-            if stderr_line.include?('ECONNREFUSED')
-              @webdriver_not_running = true
-            end
             puts stderr_line
           end
 
           if wait_thr.value.exitstatus != 0
-            if @webdriver_not_running
-              die('Webdriver manager does not appear to be running. Run `webdriver-manager start` to start it.')
-            end
-
             if @modules_missing
               die("You appear to be missing npm dependencies. Try running `npm install`\nIf the issue persists, check the package.json")
             end
           end
         end
+
+        safe_kill(@pid)
+        safe_kill(@selenium_pid) if selenium_running?
       end
 
       def output
@@ -91,6 +104,23 @@ module LearnTest
           count += test[:duration]
         end
       end
+
+      def safe_kill(pid)
+        begin
+          Process.kill('HUP', pid)
+        rescue
+        end
+      end
+
+      def selenium_running?
+        process = `ps aux | grep selenium`.split("\n").detect{ |p| p.include?('chromedriver') }
+        if process
+          @selenium_pid = process.split[1].to_i
+          return true
+        end
+        return false
+      end
+
     end
   end
 end

data/lib/learn_test/strategy.rb

@@ -52,5 +52,21 @@ module LearnTest
       puts message.red
       exit
     end
+
+    def run_install(command)
+      Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+        while out = stdout.gets do
+          puts out
+        end
+
+        while err = stderr.gets do
+          puts err
+        end
+
+        if wait_thr.value.exitstatus != 0
+          die("There was an error running #{command}")
+        end
+      end
+    end
   end
 end

data/lib/learn_test/version.rb

@@ -1,3 +1,3 @@
 module LearnTest
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler