webtester 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32953f9df768bc4a9e53c4c1b636668bd23ff6e4
-  data.tar.gz: a823800207767458c00ca5f8a057d80f262bee79
+  metadata.gz: ae26b6e2eb7322d6a5b966a77bb0567a7dadecdf
+  data.tar.gz: 1ded93b0d0cdc80b35d4fc3118d55a943d5df35c
 SHA512:
-  metadata.gz: bd7aad2b034dbce9def4f6d9776f962cf124fb529892abe3c9eae54585dd20904cc683058ea8d6386beb0b65ead9feec24d1a3455911837b316e97399531c08e
-  data.tar.gz: 45877c9df6c170ceea1585889d86e6dcf1697dfaf0eaefe7d2ca96035b531bdf7ee0acf876804e3a177da95e2819fe14e6e9f0df5188e0fb84f0dbeb186abfc9
+  metadata.gz: cb7b8584e4433c484c73f6a8031f2a8cb58c367d53901c365d9e526511722b099ea2924e9f7931d3c563c6d59a68bdc8746c2cd4f641429e6d28adef8c6b6387
+  data.tar.gz: 243ec30339b7b3f68866a10b7f08845747d6fe4c1cc7446d7dbb28ffc6785d2da798abbf2c0a7a3fb450e8424c952213ac89a323ac64460a1941a15fe1447a0a

data/lib/assertion.rb

@@ -10,14 +10,14 @@ module WT
         attr_accessor :expected_body_parts
         attr_accessor :unexpected_body_parts
 
-        def initialize(expected_codes:          '200',
+        def initialize(expected_codes:          [],
                        unexpected_codes:        [],
                        expected_headers:        [],
                        unexpected_headers:      [],
                        expected_body:           nil,
                        unexpected_body:         nil,
-                       expected_body_parts:      nil,
-                       unexpected_body_parts:    nil)
+                       expected_body_parts:      [],
+                       unexpected_body_parts:    [])
             @expected_codes         = expected_codes
             @unexpected_codes       = unexpected_codes
             @expected_headers       = expected_headers
@@ -90,7 +90,7 @@ module WT
         end
 
         def contain_body_part(body_parts)
-            if body_part.kind_of?(Array)
+            if body_parts.kind_of?(Array)
                 @expected_body_parts = @expected_body_parts | body_parts
             else
                 @expected_body_parts << body_parts
@@ -112,24 +112,36 @@ module WT
         private
 
         def test_code(response)
-            raise ExpectedCodeNotFoundException.new(response.code) unless @expected_codes.include?(response.code) or @expected_headers.length == 0
-            raise UnexpectedCodeFoundException.new(response.code) if @unexpected_codes.include?(response.code)
+            raise ExpectedCodeNotFoundException.new(@expected_codes, response.code) unless @expected_codes.include?("#{response.code}") or @expected_codes.include?("#{response.code}".to_i)
+            raise UnexpectedCodeFoundException.new(response.code) if @unexpected_codes.include?("#{response.code}") or @unexpected_codes.include?("#{response.code}".to_i)
         end
 
         def test_headers(response)
 
             @expected_headers.each do |header|
-                h_name  = (header[:name])  ? header[:name].downcase  : ''
-                h_value = (header[:value]) ? header[:value].downcase : ''
 
-                raise ExpectedHeadersNotFoundException.new(header) unless (response[h_name] and response[h_name] == h_value)
+                
+                header.each do |k, v|
+                    h_name = k.downcase
+                    h_value = v.downcase
+
+                    r_value = '???'
+                    r_value = response[h_name].downcase if response[h_name]
+
+                    raise ExpectedHeadersNotFoundException.new(header) unless (r_value == h_value)
+                end
             end
 
             @unexpected_headers.each do |header|
-                h_name  = (header[:name])  ? header[:name].downcase  : ''
-                h_value = (header[:value]) ? header[:value].downcase : ''
+                header.each do |k, v|
+                    h_name = k.downcase
+                    h_value = v.downcase
 
-                raise UnexpectedHeadersFoundException.new(header) if (response[h_name] and response[h_name] == h_value)
+                    r_value = '???'
+                    r_value = response[h_name].downcase if response[h_name]
+
+                    raise UnexpectedHeadersNotFoundException.new(header) if (r_value == h_value)
+                end
             end
         end
 
@@ -140,15 +152,15 @@ module WT
 
         def test_body_part(response)
 
-            if @expected_body_parts
+            if @expected_body_parts.length > 0
                 @expected_body_parts.each do |part|
-                    raise ExpectedCodeNotFoundException.new(part) unless response.body.include?(part)
+                    raise ExpectedCodeNotFoundException.new(part) unless part.empty? or response.body.include?(part)
                 end
             end
 
-            if @unexpected_body_parts
+            if @unexpected_body_parts.length > 0
                 @unexpected_body_parts.each do |part|
-                    raise UnexpectedBodyPartFoundException.new(part) if response.body.include?(part)
+                    raise UnexpectedBodyPartFoundException.new(part) if not part.empty? and response.body.include?(part)
                 end
             end
         end
@@ -162,10 +174,11 @@ module WT
 
     class ExpectedCodeNotFoundException < Exception
 
+        attr_reader :expected_codes
         attr_reader :code
         
-        def initialize(code)
-            super("Expected code not found in response.")
+        def initialize(expected_codes, code)
+            super("Expected code (#{expected_codes.join(' or ')}) not found in response. Code found was: #{code}")
             @code = code
         end
     end
@@ -224,7 +237,7 @@ module WT
         end
     end
 
-    class UnexpectedBodyPartException < Exception
+    class UnexpectedBodyPartFoundException < Exception
         attr_reader :body_part
 
         def initialize(body_part)

data/lib/request.rb

@@ -63,7 +63,7 @@ module WT
 
             host_ip = host;
 
-            unless host.match(/([0-9]{1,3}){4}/)
+            unless host.match(/^[0-9]{1,3}(\.[0-9]{1,3}){3}$/)
                 WT::Log.debug("\t* resolving #{host}...")
 
                 begin

data/lib/result.rb

@@ -2,10 +2,12 @@ module WT
     class Result
         attr_accessor :request
         attr_accessor :response
+        attr_accessor :error
 
-        def initialize(request, response)
+        def initialize(request, response, error = nil)
             @request  = request
             @response = response
+            @error    = error
         end
     end
 end

data/lib/test.rb

@@ -2,25 +2,42 @@ require 'request'
 require 'cookie'
 require 'web_session'
 require 'assertion'
+require 'yaml'
 
 module WT
     class Test
         attr_accessor :name
         attr_accessor :steps
 
-        def initialize(name: 'New Test', steps: [])
+        def initialize(name: 'New Test')
             @name = name
-            @steps = steps
+            @steps = []
         end
 
-        def add_step(request, assertions = [])
+        def self.load_from_file(filename)
+            yaml_content = YAML.load(File.read(filename))
 
-            asserts = assertions
-            asserts << WT::Assertion.new().code_is_equal('200') unless asserts.length > 0
+
+
+            test = WT::Test.new(name: yaml_content['test']['name'])
+
+            yaml_content['test']['steps'].each do |step|
+                request = WT::Test.request_from_yaml(step['request'])
+                assert  = WT::Test.assertion_from_yaml(step['request']['response'])
+
+                test.add_step(request, assert)
+            end
+
+            return test
+        end
+
+        def add_step(request, assertion)
+
+            assert = assertion || WT::Assertion.new().code_is_equal('200')
 
             step = {
                 :request => request,
-                :assertions => assertions
+                :assertion => assert
             }
 
             @steps << step
@@ -32,25 +49,49 @@ module WT
             session = WT::WebSession.new
 
             @steps.each do |step|
-                WT::Log.debug("\t * session.request()")
-
-                error = nil
+                result = nil
 
                 begin
                     result = session.request(step[:request], false)
 
-                    step[:assertions].each do |assertion|
-                        WT::Log.debug("\t * assertion.assert(#{result.response.code})")
-                        assertion.assert(result.response)
-                    end
+                    WT::Log.debug("\t * assertion.assert(#{result.response.code})")
+                    step[:assertion].assert(result.response)
                 rescue Exception => ex
-                    error = ex
+                    result = WT::Result.new(step[:request], nil, nil) unless result
+                    result.error = ex
                 end
 
-                block.call(step[:request], result, error)
+                block.call(result)
 
-                break if error
+                break if result.error
             end
         end
+
+        private
+
+        def self.request_from_yaml(yaml_request)
+            type    = yaml_request['type']
+            url     = yaml_request['url']
+            body    = {}
+            body    = yaml_request['body'] if yaml_request['body']
+
+            request = WT::Request.new(type, url, body)
+        end
+
+        def self.assertion_from_yaml(yaml_response)
+            assert = nil
+
+            if yaml_response
+                assert = WT::Assertion.new()
+                assert.code_is_equal(yaml_response['expected_codes']) if yaml_response['expected_codes']
+                assert.code_is_not_equal(yaml_response['unexpected_codes']) if yaml_response['unexpected_codes']
+                assert.contain_headers(yaml_response['expected_headers']) if yaml_response['expected_headers']
+                assert.not_contain_headers(yaml_response['unexpected_headers']) if yaml_response['unexpected_headers']
+                assert.contain_body_part(yaml_response['expected_body_parts']) if yaml_response['expected_body_parts']
+                assert.not_contain_body_part(yaml_response['unexpected_body_parts']) if yaml_response['unexpected_body_parts']
+            end
+
+            assert
+        end
     end
 end

data/lib/web_session.rb

@@ -34,8 +34,6 @@ module WT
 
             result = req.exec
 
-            WT::Log.debug("\t * result => #{result}")
-
             if result.response != nil
                 all_cookies = result.response['Set-Cookie']
 
@@ -68,8 +66,6 @@ module WT
         private
 
         def find_form_fields(content)
-            WT::Log.debug(">> WT::WebSession::find_form_fields()")
-
             form_fields = {}
 
             str = content
@@ -94,14 +90,10 @@ module WT
                 str = str[eidx, str.length]
             end
 
-            WT::Log.debug("<< WT::WebSession::find_form_fields()")
-
             return form_fields
         end
 
         def extract_form_field_attrs(str)
-            WT::Log.debug(">> WT::WebSession::extract_form_field_attrs()")
-
             attrs = {}
             regexp=/<input\s+.*(name|value)="([^"]*)".*\s+(name|value)="([^"]*)"\s*.*\/>/
 
@@ -110,8 +102,6 @@ module WT
                 attrs["#{$3}"] = "#{$4}"
             end
 
-            WT::Log.debug("<< WT::WebSession::extract_form_field_attrs()")
-
             return attrs
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webtester
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Diego F. Nascimento
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies: []
 description: " A simple API to create HTTP Request tests. "
 email: diego.fnascimento@gmail.com