Merge lp:~camptocamp/oerpscenario/trunk-set-context-lep into lp:oerpscenario

[Leonardo Pistone]

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

little fix in inline comments.

The only point that tickle me is that I'm not sure of the lifespan of ctx.
It may be dangerous if we do not reset it.

I would add a hook at Scenario initialization to reset it to {}.

review: Needs Fixing

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Good start, but there are other places where you want to add the context:

* all calls to browse / search / create / write / read in dsl.py

* all the same calls in the other python files of oerpscenario

review: Needs Fixing (code review, no test)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

maybe we want a helper function too:

    def get_oe_context(ctx):
        return getattr(ctx, 'oe_context', None)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

For the browse / search / create / write / read in dsl.py I agreed.
Then for the rest we can agree on a convention and update the doc.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Maybe a better approach would be to dynamically alter ctx.client._context
And reset it at the end of scenario.

My two cents.

Nicolas

[Leonardo Pistone (lepistone)]

I addressed Nicolas' remarks.

As for the Alexandre's comments, they are not done yet, because a cleaner solution could be to do that in erppeek and not in oerpscenario. See

https://github.com/tinyerp/erppeek/issues/40

So for now I could leave this MP as is, since it does what I need now (pass a context to create()) and then maybe adapt it when the new erppeek feature lands.

Thanks!

[lp:~camptocamp/oerpscenario/trunk-set-context-lep]

332. By Alexandre Fayolle - camptocamp on 2014-06-17

[MRG] new step to count number of results

334. By Leonardo Pistone on 2014-06-16

[imp] reset oe_context at scenario init

335. By Leonardo Pistone on 2014-06-16

[imp] use ast.literal_eval

[Leonardo Pistone (lepistone)]

rebased upstream

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

@lpisone : ok point taken.

review: Approve (code reiview, test)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

LGTM can be improved with released 1.6 of erppeek

review: Approve

=== modified file 'features/environment.py'
--- features/environment.py	2013-09-03 10:44:42 +0000
+++ features/environment.py	2014-06-17 08:46:43 +0000
@@ -39,6 +39,7 @@
 
 # Work around https://github.com/behave/behave/issues/145
 def before_scenario(ctx, scenario):
+    ctx.oe_context = {}
     if not hasattr(ctx, 'data'):
         ctx.data = {}
 
 
=== modified file 'features/steps/dsl.py'
--- features/steps/dsl.py	2014-06-17 08:14:33 +0000
+++ features/steps/dsl.py	2014-06-17 08:46:43 +0000
@@ -180,18 +180,25 @@
         ctx.found_item.write(table_values)
 
 
+@step(u'I set the context to "{oe_context_string}"')
+def impl(ctx, oe_context_string):
+    ctx.oe_context = literal_eval(oe_context_string)
+
+
 def create_new_obj(ctx, model_name, values):
     values = values.copy()
     xmlid = values.pop('xmlid', None)
-    record = model(model_name).create(values)
+    oe_context = getattr(ctx, 'oe_context', None)
+    record = model(model_name).create(values, context=oe_context)
     if xmlid is not None:
         ModelData = model('ir.model.data')
         module, xmlid = xmlid.split('.', 1)
-        _model_data = ModelData.create({'name': xmlid,
-                                       'model': model_name,
-                                       'res_id': record.id,
-                                       'module': module,
-                                       })
+        _model_data = ModelData.create({
+            'name': xmlid,
+            'model': model_name,
+            'res_id': record.id,
+            'module': module,
+        }, context=oe_context)
     return record
 
 
@@ -201,6 +208,7 @@
     assert active_text in ('', 'inactive', 'active', 'possibly inactive')
     Model = model(model_name)
     ctx.search_model_name = model_name
+    oe_context = getattr(ctx, 'oe_context', None)
     values = parse_domain(domain)
     active = True
     if active_text == 'inactive':
@@ -209,14 +217,14 @@
         active = None
     domain = build_search_domain(ctx, model_name, values, active=active)
     if domain is not None:
-        ids = Model.search(domain)
+        ids = Model.search(domain, context=oe_context)
     else:
         ids = []
     if len(ids) == 1:
-        ctx.found_item = Model.browse(ids[0])
+        ctx.found_item = Model.browse(ids[0], context=oe_context)
     else:
         ctx.found_item = None
-    ctx.found_items = Model.browse(ids)
+    ctx.found_items = Model.browse(ids, context=oe_context)
 
 
 @step(u'I need a{n:optional}{active_text:optional} "{model_name}" with {domain}')