actir 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6222ddd12feb24d688c141761ba44c100b4be875
-  data.tar.gz: f7c3479902e9fa4f6bcbd677851f1b610a4aa907
+  metadata.gz: 111066ba4bcff7cf8ef706a6e62cd33a1c42583d
+  data.tar.gz: 2995ee75054abb76fe64a8a61dd48ffb551675dd
 SHA512:
-  metadata.gz: 89a0b6c0d3175ac48e64bf1ed8aa4757841cdc14d58720bfb3924d9a6f7b5df5f16392effba49d4ab93f885e85f979d83e54439a95a7b65bfa2a603858be32ca
-  data.tar.gz: c573cc277cce26993a2c97b01a95e2c0c8a8106c424694e69972ddfaa63ea15eabbc5d191c30d710cad37fa1b86922e224c63e8dc1fa927d6f1aeccd8b6d6b04
+  metadata.gz: 9b1ce4c3f177719da45f3617c6c8fe8793ccac438f4b3c780c3e92a011897a4cd32a2f150eca3b25dae1352a15e3f31fa394c25109048c5fba45c56cbe4cabfe
+  data.tar.gz: c71e3d4df39cb5b28867ef4b84951dcbe3cf69be431660a83bbe0daca32a13ca4d89bfc6ca8500adaeef502210570d0e351be4bbec3659ea06ff1ed41093b73b

data/lib/actir/parallel_tests/cli.rb

@@ -284,11 +284,11 @@ module Actir
         runs = (0...num_processes).to_a
         results = if options[:non_parallel]
           runs.map do |i|
-            Actir::ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
+            @runner.execute_command(command, i, num_processes, options)
           end
         else
           execute_in_parallel(runs, num_processes, options) do |i|
-            Actir::ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
+            @runner.execute_command(command, i, num_processes, options)
           end
         end.flatten
 

data/lib/actir/parallel_tests/report/html_formatter.rb

@@ -34,7 +34,7 @@ module Actir
 
       def print_testcase_failed(testcase_name, backtrace, failure_number)
         @file.puts "    <dd class=\"testcase failed\">"
-        @file.puts "      <span class=\"failed_spec_name\">[testcase]: #{h(testcase_name)}</span>"
+        @file.puts "      <span class=\"failed_spec_name\">[Testcase]: #{h(testcase_name)}</span>"
         @file.puts "      <div id=\"testtab_#{failure_number}\" style=\"float:right\"><a class=\"expand\" href=\"#\" onClick=\"Effect('failure_#{failure_number}',this.parentNode.id);\" >+</a> </div>"
         @file.puts "      <div class=\"failure\" id=\"failure_#{failure_number}\" style=\"display:none;\">"
         @file.puts "        <div class=\"backtrace\"><pre>#{h(backtrace)}</pre></div>"

data/lib/actir/parallel_tests/test/rerunner.rb

@@ -27,25 +27,26 @@ module Actir
           # @return [String] 执行结果字符串
           #
           def re_run_tests(test_result, process_number, num_processes, options, address, times)
-              #根据重跑次数重新执行失败用例
-              result = re_run(test_result, process_number, num_processes, options, address, times)
-              #从老的执行结果输出中提取出相关数据
-              old_result = summarize_results(find_results(test_result[:stdout]))
-              #puts "old_result : " + old_result
-              #从新的执行结果中提取出数据,并算出总数
-              #因为若有多个失败用例就有多个执行结果
-              new_result = summarize_results(find_results(result[:stdout]))
-              #puts "new_result : " + new_result
-              #刷新最终的执行结果
-              if old_result == nil || old_result == ""
-                puts "[Debug] test_result : "
-                puts test_result
-              end
-              if new_result == nil || new_result == ""
-                puts "[Debug] result : "
-                puts result
-              end
-              combine_tests_results(old_result, new_result)
+            @result = load_result
+            #根据重跑次数重新执行失败用例
+            result = re_run(test_result, process_number, num_processes, options, address, times)
+            #从老的执行结果输出中提取出相关数据
+            old_result = summarize_results(find_results(test_result[:stdout]))
+            #puts "old_result : " + old_result
+            #从新的执行结果中提取出数据,并算出总数
+            #因为若有多个失败用例就有多个执行结果
+            new_result = summarize_results(find_results(result[:stdout]))
+            #puts "new_result : " + new_result
+            #刷新最终的执行结果
+            if old_result == nil || old_result == ""
+              puts "[Debug] test_result : "
+              puts test_result
+            end
+            if new_result == nil || new_result == ""
+              puts "[Debug] result : "
+              puts result
+            end
+            combine_tests_results(old_result, new_result)
           end
           
           private
@@ -56,7 +57,10 @@ module Actir
               #先获取失败用例信息
               tests = capture_failures_tests(test_result)
               cmd = ""
-              tests.each do |testcase, testfile|
+              tests.each do |unique_testname|
+                # 从combine的测试用例名称中获取测试文件名称和测试用例名称
+                testfile = @result.get_testfile_from_unique(unique_testname)
+                testcase = @result.get_testcase_from_unique(unique_testname)
                 #输出一些打印信息
                 puts "[ Re_Run ] - [ #{testfile} -n #{testcase} ] - Left #{times-1} times - in Process[#{process_number}]"
                 cmd += "#{executable} #{testfile} #{address} -n #{testcase};"
@@ -77,35 +81,42 @@ module Actir
             end
 
             #从result中获取执行结果用于生成测试报告
-            Actir::ParallelTests::Test::Result.get_testsuite_detail(result, :rerunner)
+            @result.get_testsuite_detail(result, :rerunner)
 
             return result
           end
 
           #从输出内容中获取失败用例文件名以及用例名称
           def capture_failures_tests(test_result)
-            result_array = test_result[:stdout].split("\n")
-            failure_tests_hash = {}
-            testcase = ""
-            testfile = ""
-            result_array.each do |result|
-              #取出执行失败的用例文件名称和用例名称
-              if (result =~ failure_tests_name_reg) || (result =~ error_tests_name_reg)
-                #范例:"testhehe(TestHehe)"
-                testcase = $1
-              end
-              if result =~ failure_tests_file_reg
-                #范例:"testcode/test_tt/test_hehe.rb:8:in `xxxx'"
-                testfile = $1
-              end
-              #至于为什么采用testcase => testfile的形式是因为…文件名会重复
-              if testcase != "" && testfile != "" 
-                failure_tests_hash[testcase] = testfile
-                testcase = ""
-                testfile = ""
-              end
-            end
-            failure_tests_hash
+            failure_tests = []
+            failure_tests_hash = @result.get_testfailed_info(test_result)
+            # 过滤报错信息，只需要用例名称和文件名称
+            failure_tests_hash.each do |testcase, failure_info|
+              failure_tests << testcase
+            end 
+            failure_tests
+            # result_array = test_result[:stdout].split("\n")
+            # failure_tests_hash = {}
+            # testcase = ""
+            # testfile = ""
+            # result_array.each do |result|
+            #   #取出执行失败的用例文件名称和用例名称
+            #   if (result =~ failure_tests_name_reg) || (result =~ error_tests_name_reg)
+            #     #范例:"testhehe(TestHehe)"
+            #     testcase = $1
+            #   end
+            #   if result =~ failure_tests_file_reg
+            #     #范例:"testcode/test_tt/test_hehe.rb:8:in `xxxx'"
+            #     testfile = $1
+            #   end
+            #   #至于为什么采用testcase => testfile的形式是因为…文件名会重复
+            #   if testcase != "" && testfile != "" 
+            #     failure_tests_hash[testcase] = testfile
+            #     testcase = ""
+            #     testfile = ""
+            #   end
+            # end
+            # failure_tests_hash
           end
 
           #组合出最新的执行结果
@@ -130,17 +141,17 @@ module Actir
 
           #判断是否有用例失败
           def any_test_failed?(result)
-            Actir::ParallelTests::Test::Result.any_test_failed?(result)
+            @result.any_test_failed?(result)
           end
 
           #获取错误用例名的正则
           def error_tests_name_reg
-            Actir::ParallelTests::Test::Result.error_tests_name_reg
+            @result.error_tests_name_reg
           end
 
           #获取失败用例名的正则
           def failure_tests_name_reg
-            Actir::ParallelTests::Test::Result.failure_tests_name_reg
+            @result.failure_tests_name_reg
           end
 
           #获取失败用例文件名的正则
@@ -154,6 +165,13 @@ module Actir
             /((\d+)\sfailure.*,\s(\d+)\serror)/
           end
 
+          # 加载result类
+          def load_result
+            require "actir/parallel_tests/test/result"
+            klass_name = "Actir::ParallelTests::Test::Result"
+            klass_name.split('::').inject(Object) { |x, y| x.const_get(y) }
+          end
+
         end
 
       end

data/lib/actir/parallel_tests/test/result.rb

@@ -15,10 +15,9 @@ module Actir
             if mode == :runner
               get_run_test_info(test_result)
             end
-            
             #如果有用例失败，则记录详细信息，否则不需要
             if any_test_failed?(test_result)
-              failure_detail_hash = get_testfailed_detail(test_result)
+              failure_detail_hash = get_testfailed_info(test_result)
               $testsuites.each do |testsuite|
                 testcases = testsuite[:testcases] 
                 testcases.each do |testcase|
@@ -44,21 +43,25 @@ module Actir
 
           def get_run_test_info(test_result)
             output = test_result[:stdout]
-            output.scan(/^(\[suite start\])([^\.]*)(\[suite end\])$/).each do |suite|
-              suitename = suite[1].scan(/^(suitname:\s*)([\d\w]*)/)[0][1]
+            # output.scan(/^(\[suite start\])([^\.]*)(\[suite end\])$/).each do |suite|
+            output.scan(file_suite_case_reg).each do |suite|
+              filename = suite[0]
+              testsuite = suite[1].scan(/^(suitname:\s*)([\d\w]*)/)[0][1]
+              testsuite_name = get_unique_testname(filename, testsuite)
               cases = suite[1].scan(/^(testcase:\s*)([\d\w]*)/).inject([]) do |cases,testcase|
-                cases << {:testcase_name => testcase[1], :success => true, :detail => nil}
+                testcase_name = get_unique_testname(filename, testcase[1])
+                cases << {:testcase_name => testcase_name, :success => true, :detail => nil}
               end
               # 如果testsuites中已存在此用例的信息，说明这个用例执行了rerun，就不再次添加了
               is_case_exist = $testsuites.inject(false) do |is_case_exist, testsuite|
-                if testsuite.has_value?(suitename)
+                if testsuite.has_value?(testsuite_name)
                   is_case_exist = true
                   break
                 end
                 is_case_exist
               end
               if(is_case_exist == false)
-                testsuite = {:testsuite_name => suitename, :testcases =>cases}
+                testsuite = {:testsuite_name => testsuite_name, :testcases =>cases}
                 $testsuites << testsuite
               end
             end
@@ -69,11 +72,13 @@ module Actir
           #
           # 将测试套和测试用例的详细信息写入全局变量$testsuites中
           #
-          def get_testfailed_detail(test_result)
+          def get_testfailed_info(test_result)
             result_array = test_result[:stdout].split("\n")
             failure_detail_hash = {}
+            testfile = ""
             testcase = "" 
             detail = ""
+            testcase_name = ""
             record_detail_switch = 0
 
             result_array.each do |result|
@@ -81,25 +86,41 @@ module Actir
               #遇到错误信息，开启记录错误信息开关
               record_detail_switch = 1 if result =~failure_or_error_switch_on
 
+              # 记录报错信息
               if record_detail_switch == 1 
                 detail += result + "\n"
               end
 
+              # 记录报错用例名称
               if (result =~ failure_tests_name_reg) || (result =~ error_tests_name_reg)
                 testcase = $1
               end
 
-              if testcase != "" && detail != "" && record_detail_switch == 0
-                failure_detail_hash[testcase] = detail
+              # 记录报错用例文件名称
+              if result =~ failure_tests_file_reg
+                #范例:"testcode/test_tt/test_hehe.rb:8:in `xxxx'"
+                testfile = $1
+              end
+
+              # 合并用例名称和文件名称
+              testcase_name = get_unique_testname(testfile, testcase)
+
+              if testcase_name != "" && detail != "" && record_detail_switch == 0
+                failure_detail_hash[testcase_name] = detail
                 testcase = ""
+                testfile = ""
                 detail = ""
+                testcase_name = ""
               end
             end
 
             failure_detail_hash
           end
 
-
+          # 从执行结果中获取文件/测试套/测试用例的名称
+          def file_suite_case_reg
+            /^Loaded\ssuite\s(.*)\nStarted\n\[suite start\]([^\.]*)\[suite end\]$/
+          end
 
           #判断是否有用例失败
           def any_test_failed?(result)
@@ -116,22 +137,57 @@ module Actir
             /^Failure:\s(test.+)\(.+\)/
           end
 
+          # 获取失败用例文件名的正则
+          def failure_tests_file_reg
+            /(.+\/test.+rb):\d+:in\s`.+'/
+          end
+
+          # 测试套信息开头正则
           def test_info_swtich_on
             /^\[suite start\]/
           end
 
+          # 测试套信息截止正则
           def test_info_swtich_off
             /^\[suite end\]/
           end
 
+          # 测试用例执行报错信息开头正则
           def failure_or_error_switch_on
             /^Failure:|^Error:/
           end
 
+          # 测试用例执行报错信息截止正则
           def failure_or_error_switch_off
             /^===============================================================================$/
           end
 
+          # 因为测试用例名称/测试套名称有可能重复，所以采用 测试文件名称:测试用例名称 的方式作为测试用例名称的唯一标识
+          # 也可用于测试套名称组合
+          def get_unique_testname(testfile, test)
+            if (test != "" || test != nil) && (testfile != "" || testfile != nil)
+              # 判断测试文件名称是否包含.rb后缀，如果没有则加上
+              unless testfile =~ /.*\.rb$/
+                testfile += ".rb"
+              end
+              return testfile + ":" + test 
+            else
+              return ""
+            end
+          end
+
+          def get_testfile_from_unique(unique_testname)
+            testfile_name = ""
+            unique_testname =~ /(.*)\:(.*)/
+            testfile_name = $1       
+          end
+
+          def get_testcase_from_unique(unique_testname)
+            p unique_testname
+            testcase_name = ""
+            unique_testname =~ /(.*)\:(.*)/
+            testcase_name = $2        
+          end
 
         end
 

data/lib/actir/script/cookies_baidu.rb

@@ -83,7 +83,7 @@ module Actir
             address = Actir::Remote.get_remote_address(1)
           end
         end
-        @browser = Browser.new(:www, :url => address[0], :mode => $mode, :browser => :chrome)
+        @browser = Browser.new(:www, :url => address[0], :mode => $mode, :browser => :chrome, :window_size => nil)
         @browser.goto "baifubao.com"
         @browser 
       end

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/actir/webdriver/browser.rb

@@ -34,6 +34,7 @@ class Browser
     @browser_type = args[:browser]
     @agent = args[:agent]
     @env = args[:mode]
+    @window_size = args[:window_size]
     if @env == :remote
       @url = if args[:url]
         "http://#{args[:url]}/wd/hub"
@@ -79,13 +80,14 @@ class Browser
 
   # 初始化入参
   def init_args(args = {})
+    config_exist = File.exist?(config_file)
     unless args.has_key?(:mode)
       #若通过actir执行测试用例，则会配置ENV的模式
       if ENV["mode"]
         args[:mode] = ENV["mode"].to_sym
       else
         #若ENV为空，则读取配置文件，判断有无配置文件
-        if File.exist?(config_file) 
+        if config_exist
           env = $config["config"]["test_mode"]["env"]
           args[:mode] = (env == nil) ? :local : env
         else
@@ -94,13 +96,25 @@ class Browser
       end
     end
     unless args.has_key?(:browser)
-      if File.exist?(config_file) 
+      if config_exist 
         browser_type = $config["config"]["test_mode"]["browser"]
         args[:browser] = (browser_type == nil) ? :chrome : browser_type
       else
         args[:browser] = :chrome
       end
     end
+    unless args.has_key?(:window_size)
+      if config_exist
+        window_size = $config["config"]["window_size"]
+        if window_size != nil
+          width = window_size["width"]
+          height = window_size["height"]
+        end
+        args[:window_size] = (width == nil || height == nil) ? nil : window_size
+      else
+        args[:window_size] = nil
+      end
+    end
     args[:agent] = :iphone  unless args.has_key?(:agent)
     args[:url] = $address  unless args.has_key?(:url)
     args
@@ -128,6 +142,8 @@ class Browser
       browser.window.resize_to(PHANTOMJS_SIZE["width"], PHANTOMJS_SIZE["height"])
     elsif @env == :remote
       browser.window.resize_to(REMOTE_SIZE["width"], REMOTE_SIZE["height"])
+    elsif @window_size != nil
+      browser.window.resize_to(@window_size["width"], @window_size["height"])
     end
     browser
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit