apirunner 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/apirunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jan@moviepilot.com"]

data/examples/test/api_runner/001_create_user.yml

@@ -87,7 +87,6 @@
     method:      'PUT'
     body:
       "m1035": 1
-      "m2087": 0.5
       "m1554": 2
       "m2981": 1.0
       "m1590": 2
@@ -122,7 +121,6 @@
       - m78
       ratings:
         "m1035": "1.0"
-        "m2087": "0.5"
         "m1554": "2.0"
         "m2981": "1.0"
         "m1590": "2.0"
@@ -130,7 +128,7 @@
         "m1875": "5.0"
         "m7258": "2.5"
 - name: 'User creation should fail on wrong username'
-  priority: 2
+  priority: 1
   request:
     headers:
       Content-Type: 'application/json'
@@ -141,7 +139,7 @@
   response_expectation:
     status_code: 409
 - name: 'User creation should fail on wrong fsk'
-  priority: 2
+  priority: 1
   request:
     headers:
       Content-Type: 'application/json'
@@ -153,7 +151,7 @@
   response_expectation:
     status_code: 409
 - name: 'User creation should fail on wrong expiration_date'
-  priority: 2
+  priority: 1
   request:
     headers:
       Content-Type: 'application/json'

data/examples/test/api_runner/002_update_resources.yml

@@ -1 +1,237 @@
 ---
+- name: 'Update existing user - update watchlist'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:       '/users/duffyduck/watchlist'
+    method:     'PUT'
+    body:
+    - m367
+    - m73
+    - m42
+    - m23
+  response_expectation:
+    status_code: 204
+    body:
+- name: 'Check users watchlist afterwards'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:        '/users/duffyduck'
+    method:      'GET'
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified:    /.*/
+    body:
+      username:       'duffyduck'
+      watchlist:
+      - m367
+      - m73
+      - m42
+      - m23
+- name: 'Update existing user - clean watchlist'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:       '/users/duffyduck/watchlist'
+    method:     'PUT'
+    body: []
+  response_expectation:
+    status_code: 204
+- name: 'Check users watchlist for emptyness afterwards'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:        '/users/duffyduck'
+    method:      'GET'
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified:    /.*/
+    body:
+      username: 'duffyduck'
+      watchlist: []
+- name: 'Update existing user - update skiplist'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:       '/users/duffyduck/skiplist'
+    method:     'PUT'
+    body:
+    - m366
+    - m72
+    - m41
+    - m22
+  response_expectation:
+    status_code: 204
+    body:
+- name: 'Check users skiplist afterwards'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:        '/users/duffyduck'
+    method:      'GET'
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified:    /.*/
+    body:
+      username:       'duffyduck'
+      skiplist:
+      - m366
+      - m72
+      - m41
+      - m22
+- name: 'Update existing user - clean skiplist'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:       '/users/duffyduck/skiplist'
+    method:     'PUT'
+    body: []
+  response_expectation:
+    status_code: 204
+    body:
+- name: 'Check users skiplist emptyness afterwards'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:        '/users/duffyduck'
+    method:      'GET'
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified:    /.*/
+    body:
+      username:       'duffyduck'
+      skiplist: []
+- name: 'Update existing user - update blacklist'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:       '/users/duffyduck/blacklist'
+    method:     'PUT'
+    body:
+    - m365
+    - m71
+    - m40
+    - m21
+  response_expectation:
+    status_code: 204
+    body:
+- name: 'Check Users blacklist afterwards'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:        '/users/duffyduck'
+    method:      'GET'
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified:    /.*/
+    body:
+      username:       'duffyduck'
+      blacklist:
+      - m365
+      - m71
+      - m40
+      - m21
+- name: 'Update existing user - clean blacklist'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:       '/users/duffyduck/blacklist'
+    method:     'PUT'
+    body: []
+  response_expectation:
+    status_code: 204
+    body:
+- name: 'Check users blacklist emptyness afterwards'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path:        '/users/duffyduck'
+    method:      'GET'
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified:    /.*/
+    body:
+      username:       'duffyduck'
+      blacklist: []
+- name : 'Watchlist update of a non existing profile should return 404'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path: '/users/foobarfooz/watchlist'
+    method: 'PUT'
+    body:
+      watchlist:
+      - m365
+      - m71
+  response_expectation:
+    status_code: 404
+- name : 'Skiplist update of a non existing profile should return 404'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path: '/users/foobarfooz/skiplist'
+    method: 'PUT'
+    body:
+      skiplist:
+      - m365
+      - m71
+  response_expectation:
+    status_code: 404
+- name : 'Blacklist update of a non existing profile should return 404'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path: '/users/foobarfooz/blacklist'
+    method: 'PUT'
+    body:
+      blacklist:
+      - m365
+      - m71
+  response_expectation:
+    status_code: 404
+- name : 'Watchlist update with non existing movies should return 409'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path: '/users/duffyduck/watchlist'
+    method: 'PUT'
+    body:
+      watchlist:
+      - m9999999999999999
+      - m8888888888888888
+      - m7777777777777777
+  response_expectation:
+    status_code: 409
+- name : 'Blacklist update with non existing movies should return 409'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path: '/users/duffyduck/blacklist'
+    method: 'PUT'
+    body:
+      blacklist:
+      - m9999999999999999
+      - m8888888888888888
+      - m7777777777777777
+  response_expectation:
+    status_code: 409
+- name : 'Skiplist update with non existing movies should return 409'
+  request:
+    headers:
+      Content-Type: 'application/json'
+    path: '/users/duffyduck/skiplist'
+    method: 'PUT'
+    body:
+      skiplist:
+      - m9999999999999999
+      - m8888888888888888
+      - m7777777777777777
+  response_expectation:
+    status_code: 409

data/examples/test/api_runner/003_update_ratings.yml

@@ -1 +1,27 @@
 ---
+- name: "Without per_page there should come out 1 rateable movie"
+  request:
+    path:           '/users/duffyduck/rateables'
+    method:         'GET'
+    headers:
+      Content-Type: 'application/json'
+    body: {}
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified: /.*/
+    body:            /^\["m\d+"\]$/
+- name: "With per_page 10 there should come out 10 rateable movies"
+  request:
+    path:           '/users/duffyduck/rateables?per_page=10'
+    parameters:
+      per_page: 10
+    method:         'GET'
+    headers:
+      Content-Type: 'application/json'
+    body: {}
+  response_expectation:
+    status_code: 200
+    headers:
+      Last-Modified: /.*/
+    body:            /^\[("m\d+",?){10}\]$/

data/examples/test/api_runner/999_delete_user.yml

@@ -6,17 +6,42 @@
     body:        {}
   response_expectation:
     status_code: 202
+- name: 'User 1 should be nonexistant afterwards'
+  request:
+    path:          '/users/duffyduck'
+    method:        'GET'
+    body:          {}
+  response_expectation:
+    status_code: 404
 - name: 'Delete User 2'
+  priority: 1
   request:
     path:        '/users/duffyduck2'
     method:      'DELETE'
     body:        {}
   response_expectation:
     status_code: 202
+- name: 'User 2 should be nonexistant afterwards'
+  priority: 1
+  request:
+    path:          '/users/duffyduck2'
+    method:        'GET'
+    body:          {}
+  response_expectation:
+    status_code: 404
 - name: 'Delete User 3'
+  priority: 1
   request:
     path:        '/users/duffyduck3'
     method:      'DELETE'
     body:        {}
   response_expectation:
     status_code: 202
+- name: 'User 3 should be nonexistant afterwards'
+  priority: 1
+  request:
+    path:          '/users/duffyduck3'
+    method:        'GET'
+    body:          {}
+  response_expectation:
+    status_code: 404

data/lib/expectation_matcher.rb

@@ -66,6 +66,15 @@ class ExpectationMatcher
   def response_body(response, testcase)
     result = Result.new(testcase, response)
 
+    # special case: the whole body has to be matched via a regular expression
+    if is_regex?(testcase['response_expectation']['body'])
+      if not regex_matches?(testcase['response_expectation']['body'], response.body)
+        result.succeeded = false
+        result.error_message = " expected the whole body to match regex --#{testcase['response_expectation']['body']}--\n got --#{response.body}--"
+      end
+      return result
+    end
+
     expected_body_hash = testcase['response_expectation']['body']
 
     # in case we have no body expectation we simply return success
@@ -76,7 +85,7 @@ class ExpectationMatcher
       responded_body_hash = JSON.parse(response.body)
     rescue
       result = Result.new(testcase, response)
-      result.success = false
+      result.succeeded = false
       result.error_message = " expected response to have a body\n got raw body --#{response.body}-- which is nil or an unparseable hash"
       return result
     end
@@ -90,6 +99,10 @@ class ExpectationMatcher
       expectation_node = expectation_tree.xpath(path).first
       response_node = response_tree.xpath(path).first
 
+      debugger
+      # in some (not awesome) cases the root node occures as leaf, so we have to skip him here
+      next if expectation_node.name == "hash"
+
       # return error if response body does not have the expected entry
       if response_node.nil?
         result.succeeded = false

data/lib/http_client.rb

@@ -17,7 +17,6 @@ class HttpClient
   # returns struct containing response.code, headers, body and message
   # this is only for easily interfaceing another http client
   def build_response(raw_response)
-    debugger
     response_struct = Struct.new(:code, :message, :headers, :body)
     response = response_struct.new
     response.code = raw_response.code

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2602692957616549135
+      hash: -3503113694537890218
       segments: 
       - 0
       version: "0"