From e3745b5d74dd5253d56d310db1d3b38d1a1dc4c2 Mon Sep 17 00:00:00 2001 From: Dean Gardiner Date: Fri, 4 Oct 2013 02:39:44 +1300 Subject: [PATCH] Updated Caper library --- libs/caper/constraint.py | 2 +- libs/caper/group.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/caper/constraint.py b/libs/caper/constraint.py index 8e5ee28..d8f5280 100644 --- a/libs/caper/constraint.py +++ b/libs/caper/constraint.py @@ -38,7 +38,7 @@ class CaptureConstraint(object): def _compare_eq(self, fragment, name, expected): if not hasattr(fragment, name): - return None + return 1.0, False return 1.0, getattr(fragment, name) == expected diff --git a/libs/caper/group.py b/libs/caper/group.py index 3dcb00b..71b9766 100644 --- a/libs/caper/group.py +++ b/libs/caper/group.py @@ -14,8 +14,9 @@ from logr import Logr +from caper import CaperClosure from caper.helpers import clean_dict -from caper.result import CaperFragmentNode +from caper.result import CaperFragmentNode, CaperClosureNode from caper.step import CaptureStep from caper.constraint import CaptureConstraint @@ -70,7 +71,9 @@ class CaptureGroup(object): def parse_subject(self, parent_head, subject): parent_node = parent_head[0] if type(parent_head) is list else parent_head - # TODO - if subject is a closure? + # TODO just jumping into closures for now, will be fixed later + if type(subject) is CaperClosure: + return [CaperClosureNode(subject, parent_head)] nodes = []