webtester 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae26b6e2eb7322d6a5b966a77bb0567a7dadecdf
-  data.tar.gz: 1ded93b0d0cdc80b35d4fc3118d55a943d5df35c
+  metadata.gz: 324876a5e91c34470e62213bd59e91cf302c778d
+  data.tar.gz: 755c266e7e89a3a0afd385d5faced240c7d70129
 SHA512:
-  metadata.gz: cb7b8584e4433c484c73f6a8031f2a8cb58c367d53901c365d9e526511722b099ea2924e9f7931d3c563c6d59a68bdc8746c2cd4f641429e6d28adef8c6b6387
-  data.tar.gz: 243ec30339b7b3f68866a10b7f08845747d6fe4c1cc7446d7dbb28ffc6785d2da798abbf2c0a7a3fb450e8424c952213ac89a323ac64460a1941a15fe1447a0a
+  metadata.gz: d7833ff68aa8f6dc4560b12ecbdbf6dfb346ee5750571ebee3fe23f9acfd7ef36bf62890628a8b975d1e328fd6aab80d4e84c16f3e5e337138a700c7b2ab6e0c
+  data.tar.gz: b72ce344ae3fa1b29035fef936a0f5a3d15acab090fc9f362b8571bfd2948e8a7a53f31f7103c90c7c81495ece69dbe68326a0395385ad343559c75cca726365

data/lib/request.rb

@@ -16,12 +16,12 @@ module WT
         attr_accessor :proxy_port
 
         def initialize(request_type, request_url, request_data = {})
-            @request_type = request_type
-            @request_url  = request_url
-            @request_data = request_data
-            @headers = {}
-            @proxy_host = nil
-            @proxy_port = 0
+            self.request_type = request_type
+            self.request_url  = request_url
+            self.request_data = request_data
+            self.headers = {}
+            self.proxy_host = nil
+            self.proxy_port = 0
         end
 
         def exec
@@ -85,9 +85,9 @@ module WT
 
                 http = nil
 
-                if @proxy_host
-                    WT::Log.debug("\t* @proxy_host = #{@proxy_host}")
-                    http = Net::HTTP::Proxy(@proxy_host, @proxy_port).new(host_ip, port)
+                if self.proxy_host
+                    WT::Log.debug("\t* @proxy_host = #{self.proxy_host}, proxy_port = #{self.proxy_port}")
+                    http = Net::HTTP.new(self.proxy_host, self.proxy_port)
                 else
                     WT::Log.debug("\t* Net::HTTP.new(#{host_ip}, #{port})")
                     http = Net::HTTP.new(host_ip, port)

data/lib/test.rb

@@ -72,10 +72,14 @@ module WT
         def self.request_from_yaml(yaml_request)
             type    = yaml_request['type']
             url     = yaml_request['url']
-            body    = {}
-            body    = yaml_request['body'] if yaml_request['body']
+            body    = yaml_request['body'] || {}
+
+            proxy_parts = yaml_request['proxy'].split(':')  if yaml_request['proxy']
 
             request = WT::Request.new(type, url, body)
+            request.proxy_host  = proxy_parts[0]
+            request.proxy_port  = proxy_parts[1]
+            request
         end
 
         def self.assertion_from_yaml(yaml_response)

data/lib/web_session.rb

@@ -29,8 +29,8 @@ module WT
             end
 
             # set proxy if exists
-            req.proxy_host = @proxy_host
-            req.proxy_port = @proxy_port
+            req.proxy_host = @proxy_host if @proxy_host
+            req.proxy_port = @proxy_port if @proxy_port > 0
 
             result = req.exec
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webtester
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Diego F. Nascimento