actir 1.4.3.3 → 1.4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8fc1246dfcb5828a1f226487f0ae9cfbb2981c
-  data.tar.gz: 42082fe494562fb4ce522fa0aa226cf039a72583
+  metadata.gz: 1461e36e0d1f579d180b38891422f522791930f8
+  data.tar.gz: 3a99bfd61f3b201d099d10044f3487e6ce5a8d59
 SHA512:
-  metadata.gz: a921875cbfe045de02835f8f0e5e0d92a8140376ce82c24846cbe3ad26a81a63f88b11e90533ebcf4da56e08ffa422e5a4f03dd1fe461d1fa57a5ac22d517a3a
-  data.tar.gz: 227ded22a43392b8e73f0a1ed5dd0628408c800d25e398ef98f831cc2802a0becb2067bb9ff77241db6095f848973f4bbd7ab1518850da79dcded7dca690283f
+  metadata.gz: efedacf08c1872be573b6a2cc8508f8dbcbf4fb52c2873c18abb235556ba4c06058f46595c25c6296fd1d40ae9c2923f71a2e829a40a8d7d5dd981d3f040ba23
+  data.tar.gz: 6165c769d3bb70d3fe97201fd1ed726593b19b8e4967f11cdc672ab8ae288b6c52c5d341a3b610583df486129ef347f9e8a6a8ed12b66766f40efefdfc5ad50a

data/README.md

@@ -19,6 +19,7 @@ Application Concurrence Test in Ruby.
 
 ## 使用须知
 
+
 ### 测试工程结构
   - **config**：配置文件  
     --- config.yaml：总体配置文件,test_mode相关的配置项必须要填;  
@@ -29,6 +30,7 @@ Application Concurrence Test in Ruby.
     - |--- `user`：根据系统业务抽象出的角色及其Action; 
   - **testcode**： 测试用例, 文件和用例方法都要以`test`开头, 执行之前需要初始化`Actir::Initializer.new(project_path)`，`project_path`为测试工程根目录;
 
+
 ### 浏览器对象
 ``` ruby
 Browser.new(type, *args)
@@ -41,6 +43,7 @@ Browser重新封装了Watir以及Selenium的初始化浏览器的方法
   - `:mode`：启动模式,支持 :local/:remote, 默认为local  
   - `:url`： 配合mode为remote的模式,指定远程机器的url,需要 IP+端口号  
 
+
 ### Initializer自动加载工程文件
 ``` ruby
 Actir::Initializer.new(project_path)

data/lib/actir/initializer.rb

@@ -36,7 +36,8 @@ module Actir
 
     def load_item
       @item_path = File.join(@elements_path, 'item')
-      Dir.glob(File.join @item_path, '**', '*.rb').select {|p| p =~ /\.rb$/}.each do |i|
+      @list = Dir.glob(File.join @item_path, '**', '*.rb').select {|p| p =~ /\.rb$/}.sort
+      @list.each do |i|
         puts i if $debug
         require "#{i}" 
       end #each
@@ -44,7 +45,8 @@ module Actir
 
     def load_user
       @user_path = File.join(@elements_path, 'user')
-      Dir.glob(File.join @user_path, '**', '*.rb').select {|p| p =~ /\.rb$/}.each do |u|
+      @list = Dir.glob(File.join @user_path, '**', '*.rb').select {|p| p =~ /\.rb$/}.sort
+      @list.each do |u|
         puts u if $debug
         require "#{u}" 
       end #each
@@ -52,7 +54,8 @@ module Actir
 
     def load_components
       @components_path = File.join(@elements_path, 'components')
-      Dir.glob(File.join @components_path, '**', '*.rb').select {|p| p =~ /\.rb$/}.each do |c|
+      @list = Dir.glob(File.join @components_path, '**', '*.rb').select {|p| p =~ /\.rb$/}.sort
+      @list.each do |c|
         puts c if $debug
         require "#{c}" 
       end #each
@@ -60,7 +63,8 @@ module Actir
     
     def load_pages
       @pages_path = File.join(@elements_path, 'pages')
-      Dir.glob(File.join @pages_path, '**', '*.rb').select { |p| p =~ /\.rb$/ }.each do |page|
+      @list = Dir.glob(File.join @pages_path, '**', '*.rb').select { |p| p =~ /\.rb$/ }.sort
+      @list.each do |page|
         puts "#{page}"if $debug
         require "#{page}"
       end #each

data/lib/actir/parallel_tests/cli.rb

@@ -8,7 +8,7 @@ module Actir
 
     class CLI
       def run(argv)
-        $env = "online"
+        $env = "qatest"
         options = parse_options!(argv)
         num_processes = Actir::ParallelTests.determine_number_of_processes(options[:count])
         $mode = Actir::ParallelTests.determine_run_mode(options[:mode])

data/lib/actir/script/cookies_baidu.rb

@@ -199,8 +199,8 @@ module Actir
       # 通过whoami命令获取当前账户名称
       # 暂时存放在/User/xx/目录下
       def directory
-        user_name = `whoami`
-        return "/Users/" + user_name.chomp + "/cookies/"
+        user_home = `echo ~`
+        return user_home.chomp + "/cookies/"
       end
 
       def file_name

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.4.3.3"
+  VERSION = "1.4.3.4"
 end

data/lib/actir/webdriver/browser.rb

@@ -1,5 +1,4 @@
 require 'actir/webdriver/driver'
-require 'timeout'
 
 #
 # 初始化测试用浏览器

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.4.3.3
+  version: 1.4.3.4
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.45'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Distribut automated testing framework for Web or App.
@@ -117,8 +117,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -160,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Application Concurrence Test in Ruby.