From a5ffd91bf5d17ee5b3bbfc271c96d9b8aa8886ea Mon Sep 17 00:00:00 2001
From: Code Raguet <ignacio.code@gmail.com>
Date: Thu, 26 Sep 2013 16:09:37 +0000
Subject: Merge branch 'DEV'

---
(limited to 'webapp/webapp/features/terrain.py')

diff --git a/webapp/webapp/features/terrain.py b/webapp/webapp/features/terrain.py
index 632ac37..ed52bf6 100644
--- a/webapp/webapp/features/terrain.py
+++ b/webapp/webapp/features/terrain.py
@@ -36,9 +36,11 @@ def load_fixture(fixture_name):
 
 @before.each_feature
 def before_each_feature(feature):
+    """This is the main lettuce hook "@before.each_feature"."""
     drop_mongo()
     drop_sqlite()
-    if feature.name == "Researcher adds images to options":
+    if feature.name in ("Researcher adds images to options",
+                        "Researcher can't modify poll's structure"):
         load_fixture("generic_researcher")
 
 
--
cgit v0.9.1