Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output

Browse Source 
Clytwynec/clean up lettuce output
This commit is contained in:
clytwynec
2014-07-14 09:09:25 -04:00
parent 6131177891 0581d0c5a1
commit 1807948f2e
4 changed files with 24 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cms/envs/acceptance.py
View File

@@ -24,15 +24,19 @@ import os
def seed():
return os.getppid()
# Suppress error message "Cannot determine primary key of logged in user"
# from track.middleware that gets triggered when using an auto_auth workflow
# This is an ERROR level warning so we need to set the threshold at CRITICAL
logging.getLogger('track.middleware').setLevel(logging.CRITICAL)
# Silence noisy logs
LOG_OVERRIDES = [
('track.middleware', logging.CRITICAL),
('codejail.safe_exec', logging.ERROR),
('edx.courseware', logging.ERROR),
('edxmako.shortcuts', logging.ERROR),
('audit', logging.ERROR),
('contentstore.views.import_export', logging.CRITICAL),
('xmodule.x_module', logging.CRITICAL),
]
# Suppress warning message "Cannot find corresponding link for name: <foo>"
# from edxmako.shortcuts. We have no appropriate pages in the platform to
# use, so these are not set up for TOS and PRIVACY
logging.getLogger('edxmako.shortcuts').setLevel(logging.ERROR)
for log_name, log_level in LOG_OVERRIDES:
logging.getLogger(log_name).setLevel(log_level)
update_module_store_settings(
MODULESTORE,

32
lms/djangoapps/courseware/features/help.feature
View File

@@ -1,32 +0,0 @@
@shard_2
Feature: LMS.The help module should work
In order to get help
As a student
I want to be able to report a problem
Scenario: I can submit a problem when I am not logged in
Given I visit the homepage
When I open the help form
And I report a "<FeedbackType>"
Then I should see confirmation that the issue was received
Examples:
| FeedbackType |
| problem |
| suggestion |
| question |
Scenario: I can submit a problem when I am logged in
Given I am in a course
When I open the help form
And I report a "<FeedbackType>" without saying who I am
Then I should see confirmation that the issue was received
Examples:
| FeedbackType |
| problem |
| suggestion |
| question |

45
lms/djangoapps/courseware/features/help.py
View File

@@ -1,45 +0,0 @@
# pylint: disable=C0111
# pylint: disable=W0621
from lettuce import world, step
@step(u'I open the help form')
def open_help_modal(step):
help_css = 'div.help-tab'
world.css_click(help_css)
@step(u'I report a "([^"]*)"$')
def submit_problem_type(step, submission_type):
type_css = '#feedback_link_{}'.format(submission_type)
world.css_click(type_css)
fill_field('name', 'Robot')
fill_field('email', 'robot@edx.org')
fill_field('subject', 'Test Issue')
fill_field('details', 'I am having a problem')
submit_css = 'div.submit'
world.css_click(submit_css)
@step(u'I report a "([^"]*)" without saying who I am$')
def submit_partial_problem_type(step, submission_type):
type_css = '#feedback_link_{}'.format(submission_type)
world.css_click(type_css)
fill_field('subject', 'Test Issue')
fill_field('details', 'I am having a problem')
submit_css = 'div.submit'
world.css_click(submit_css)
@step(u'I should see confirmation that the issue was received')
def see_confirmation(step):
assert world.browser.evaluate_script("$('input[value=\"Submit\"]').attr('disabled')") == 'disabled'
def fill_field(name, info):
def fill_info():
form_css = 'form.feedback_form'
form = world.css_find(form_css)
form.find_by_name(name).fill(info)
world.retry_on_exception(fill_info)

18
lms/envs/acceptance.py
View File

@@ -27,10 +27,17 @@ import string
def seed():
return os.getppid()
# Suppress error message "Cannot determine primary key of logged in user"
# from track.middleware that gets triggered when using an auto_auth workflow
# This is an ERROR level warning so we need to set the threshold at CRITICAL
logging.getLogger('track.middleware').setLevel(logging.CRITICAL)
# Silence noisy logs
LOG_OVERRIDES = [
('track.middleware', logging.CRITICAL),
('codejail.safe_exec', logging.ERROR),
('edx.courseware', logging.ERROR),
('audit', logging.ERROR),
('instructor_task.api_helper', logging.ERROR),
]
for log_name, log_level in LOG_OVERRIDES:
logging.getLogger(log_name).setLevel(log_level)
update_module_store_settings(
MODULESTORE,
@@ -132,8 +139,7 @@ CC_PROCESSOR['CyberSource']['PURCHASE_ENDPOINT'] = "/shoppingcart/payment_fake"
# We do not yet understand why this occurs. Setting this to true is a stopgap measure
USE_I18N = True
FEATURES['ENABLE_FEEDBACK_SUBMISSION'] = True
FEEDBACK_SUBMISSION_EMAIL = 'dummy@example.com'
FEATURES['ENABLE_FEEDBACK_SUBMISSION'] = False
# Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
INSTALLED_APPS += ('lettuce.django',)