actir 1.4.0 → 1.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/actir/version.rb +1 -1
- data/lib/actir/webdriver/browser.rb +5 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 69363dbceeb2bc9e367b6608093693bc2989b6b8
|
|
4
|
+
data.tar.gz: 35c30e7d8621858453b9e0e6a0788b5fb48ce96b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 75f39e38ffc1c86bf980810d0efabd19bff50f20a9a989e3d0f2c3bf870717eecbc146fef105979e49b544e80a6fef12e54c62ef12d4bdbd9b4e486985382ced
|
|
7
|
+
data.tar.gz: 80170ddaa345fb3beb0fec988020b8eca12f0af073a2e6e198e8de87d140877a53b47c118bd3222dac92ef413ef42393ac1f5a91ea26d37910fc7de849716cea
|
data/lib/actir/version.rb
CHANGED
|
@@ -82,7 +82,7 @@ class Browser
|
|
|
82
82
|
# 初始化入参
|
|
83
83
|
def init_args(args = {})
|
|
84
84
|
config_exist = File.exist?(config_file)
|
|
85
|
-
unless args.has_key?(:mode)
|
|
85
|
+
unless args.has_key?(:mode) && args[:mode] != nil
|
|
86
86
|
#若通过actir执行测试用例，则会配置ENV的模式
|
|
87
87
|
if ENV["mode"]
|
|
88
88
|
args[:mode] = ENV["mode"].to_sym
|
|
@@ -96,7 +96,7 @@ class Browser
|
|
|
96
96
|
end
|
|
97
97
|
end
|
|
98
98
|
end
|
|
99
|
-
unless args.has_key?(:browser)
|
|
99
|
+
unless args.has_key?(:browser) && args[:browser] != nil
|
|
100
100
|
if config_exist
|
|
101
101
|
browser_type = $config["config"]["test_mode"]["browser"]
|
|
102
102
|
args[:browser] = (browser_type == nil) ? :chrome : browser_type
|
|
@@ -104,7 +104,7 @@ class Browser
|
|
|
104
104
|
args[:browser] = :chrome
|
|
105
105
|
end
|
|
106
106
|
end
|
|
107
|
-
unless args.has_key?(:window_size)
|
|
107
|
+
unless args.has_key?(:window_size) && args[:window_size] != nil
|
|
108
108
|
if config_exist
|
|
109
109
|
window_size = $config["config"]["window_size"]
|
|
110
110
|
if window_size != nil
|
|
@@ -116,8 +116,8 @@ class Browser
|
|
|
116
116
|
args[:window_size] = nil
|
|
117
117
|
end
|
|
118
118
|
end
|
|
119
|
-
args[:agent] = :iphone unless args.has_key?(:agent)
|
|
120
|
-
args[:url] = $address unless args.has_key?(:url)
|
|
119
|
+
args[:agent] = :iphone unless args.has_key?(:agent) && args[:agent] != nil
|
|
120
|
+
args[:url] = $address unless args.has_key?(:url) && args[:url] != nil
|
|
121
121
|
args
|
|
122
122
|
end
|
|
123
123
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: actir
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.4.
|
|
4
|
+
version: 1.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- hub
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-03-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-unit
|