Skip to content

X
xblock-poll
Commit eeb2ba85 by Xavier Antoviaque
Options

Merge pull request #2 from open-craft/style_tweaks 

Appearance tweaks and studio tests, per QA Feedback.
parents cb450d50 f3ff848d
Showing with 139 additions and 63 deletions
poll/poll.py
......@@ -356,18 +356,14 @@ class PollBlock(PollBase):
return [
("Default Poll",
"""
<vertical_demo>
<poll />
</vertical_demo>
<poll />
"""),
("Customized Poll",
"""
<vertical_demo>
<poll tally="{'long': 20, 'short': 29, 'not_saying': 15, 'longer' : 35}"
question="## How long have you been studying with us?"
answers='[["longt", {"label": "A very long time", "img": null}], ["short", {"label": "Not very long", "img": null}], ["not_saying", {"label": "I shall not say", "img": null}], ["longer", {"label": "Longer than you", "img": null}]]'
feedback="### Thank you&#10;&#10;for being a valued student."/>
</vertical_demo>
<poll tally="{'long': 20, 'short': 29, 'not_saying': 15, 'longer' : 35}"
question="## How long have you been studying with us?"
answers='[["longt", {"label": "A very long time", "img": null}], ["short", {"label": "Not very long", "img": null}], ["not_saying", {"label": "I shall not say", "img": null}], ["longer", {"label": "Longer than you", "img": null}]]'
feedback="### Thank you&#10;&#10;for being a valued student."/>
"""),
]
......@@ -667,17 +663,13 @@ class SurveyBlock(PollBase):
return [
("Default Survey",
"""
<vertical_demo>
<survey />
</vertical_demo>
<survey />
"""),
("Survey Functions",
"""
<vertical_demo>
<survey tally='{"q1": {"sa": 5, "a": 5, "n": 3, "d": 2, "sd": 5}, "q2": {"sa": 3, "a": 2, "n": 3, "d": 10, "sd": 2}, "q3": {"sa": 2, "a": 7, "n": 1, "d": 4, "sd": 6}, "q4": {"sa": 1, "a": 2, "n": 8, "d": 4, "sd": 5}}'
questions='[["q1", {"label": "I feel like this test will pass.", "img": null}], ["q2", {"label": "I like testing software", "img": null}], ["q3", {"label": "Testing is not necessary", "img": null}], ["q4", {"label": "I would fake a test result to get software deployed.", "img": null}]]'
answers='[["sa", "Strongly Agree"], ["a", "Agree"], ["n", "Neutral"], ["d", "Disagree"], ["sd", "Strongly Disagree"]]'
feedback="### Thank you&#10;&#10;for running the tests."/>
</vertical_demo>
<survey tally='{"q1": {"sa": 5, "a": 5, "n": 3, "d": 2, "sd": 5}, "q2": {"sa": 3, "a": 2, "n": 3, "d": 10, "sd": 2}, "q3": {"sa": 2, "a": 7, "n": 1, "d": 4, "sd": 6}, "q4": {"sa": 1, "a": 2, "n": 8, "d": 4, "sd": 5}}'
questions='[["q1", {"label": "I feel like this test will pass.", "img": null}], ["q2", {"label": "I like testing software", "img": null}], ["q3", {"label": "Testing is not necessary", "img": null}], ["q4", {"label": "I would fake a test result to get software deployed.", "img": null}]]'
answers='[["sa", "Strongly Agree"], ["a", "Agree"], ["n", "Neutral"], ["d", "Disagree"], ["sd", "Strongly Disagree"]]'
feedback="### Thank you&#10;&#10;for running the tests."/>
""")
]
poll/public/css/poll.css
......@@ -145,7 +145,7 @@ li.poll-result .poll-image {
.survey-table thead tr th {
font-weight: bold;
font-size: .8rem;
font-size: .9rem;
}
.survey-table .survey-row {
......
poll/public/handlebars/poll_results.handlebars
<script id="poll-results-template" type="text/html">
<h2 class="poll-header">{{display_name}}</h2>
<h3 class="poll-header">{{display_name}}</h3>
<div class="poll-question-container">{{{question}}}</div>
<ul class="poll-answers-results">
{{#each tally}}
......@@ -35,7 +35,7 @@
<div class="poll-footnote">Results gathered from {{total}} respondent{{#if plural}}s{{/if}}.</div>
{{#if feedback}}
<hr />
<h2 class="poll-header">Feedback</h2>
<h3 class="poll-header">Feedback</h3>
<div class="poll-feedback">
{{{feedback}}}
</div>
......
poll/public/handlebars/survey_results.handlebars
......@@ -29,7 +29,7 @@
<div class="poll-footnote">Results gathered from {{total}} respondent{{#if plural}}s{{/if}}.</div>
{{#if feedback}}
<hr />
<h2 class="poll-header">Feedback</h2>
<h3 class="poll-header">Feedback</h3>
<div class="poll-feedback">
{{{feedback}}}
</div>
......
poll/public/js/poll_edit.js
function PollEditUtil(runtime, element, pollType) {
var self = this;
var notify;
// These URLs aren't validated in real time, so even if they don't exist for a type of block
// we can create a reference to them.
this.loadAnswers = runtime.handlerUrl(element, 'load_answers');
this.loadQuestions = runtime.handlerUrl(element, 'load_questions');
// The workbench doesn't support notifications.
notify = typeof(runtime.notify) != 'undefined';
this.init = function () {
// Set up the editing form for a Poll or Survey.
var temp = $('#poll-form-component', element).html();
......@@ -26,6 +30,10 @@ function PollEditUtil(runtime, element, pollType) {
// collisions in the real world.
var bottom = $(button_mapping[context_key]['bottomMarker']);
var new_item_dict = self.extend({}, button_mapping[context_key]['template']);
// We have to insert this key now rather than keep it in the template
// so that it's generated with the current time. If we constructed it as part
// of the template, all the keys would be the same, since the time would be calculated
// once.
new_item_dict['key'] = Date.now();
var new_item = $(self.answerTemplate({'items': [new_item_dict]}));
bottom.before(new_item);
......@@ -215,7 +223,9 @@ function PollEditUtil(runtime, element, pollType) {
data['question'] = $('#poll-question-editor', element).val();
data['feedback'] = $('#poll-feedback-editor', element).val();
runtime.notify('save', {state: 'start', message: "Saving"});
if (notify) {
runtime.notify('save', {state: 'start', message: "Saving"});
}
$.ajax({
type: "POST",
url: handlerUrl,
......@@ -223,9 +233,9 @@ function PollEditUtil(runtime, element, pollType) {
// There are issues with using proper status codes at the moment.
// So we pass along a 'success' key for now.
success: function(result) {
if (result['success']) {
if (result['success'] && notify) {
runtime.notify('save', {state: 'end'})
} else {
} else if (notify) {
runtime.notify('error', {
'title': 'Error saving poll',
'message': self.format_errors(result['errors'])
......
tests/integration/studio_scenarios.py 0 → 100644
"""
Contains a list of lists that will be used as the DDT arguments for the studio test.
"""
ddt_scenarios = [
[
'Poll Studio',
'answer',
4,
'label.poll-answer'
],
[
'Survey Studio',
'answer',
5,
'th.survey-answer'
],
[
'Survey Studio',
'question',
4,
'td.survey-question'
],
]
tests/integration/test_studio.py 0 → 100644
"""
Runs tests for the studio views.
"""
from ddt import ddt, unpack, data
from selenium.common.exceptions import NoSuchElementException
from selenium.webdriver.support.wait import WebDriverWait
from base_test import PollBaseTest
from studio_scenarios import ddt_scenarios
@ddt
class StudioTest(PollBaseTest):
"""
Mixin class for poll studio tests.
"""
default_css_selector = '#settings-tab'
def studio_save(self):
self.browser.find_element_by_css_selector('#poll-submit-options').click()
@data(*ddt_scenarios)
@unpack
def test_add_items(self, page_name, item_type, num_existing_items, answer_css_selector):
"""
Verify we can add more than one item and they both save.
"""
self.go_to_page(page_name, view_name='studio_view')
add_item_button = self.browser.find_element_by_css_selector('#poll-add-%s' % item_type)
# Add two answers
add_item_button.click()
add_item_button.click()
# Make sure we get forms for both.
wait = WebDriverWait(self.browser, self.timeout)
selector = '.poll-%s-studio-item' % item_type
total = num_existing_items + 2
def get_last_item(driver):
items = driver.find_elements_by_css_selector(selector)
try:
# Start from 0
return items[total - 1]
except IndexError:
raise NoSuchElementException
wait.until(get_last_item, u"{}th copy of selector '{}' should exist.".format(total, selector))
answers = self.browser.find_elements_by_css_selector('.poll-%s-studio-item' % item_type)
results = []
for index, element in enumerate(answers[-2:]):
# First input is the label, which should always be there.
label = element.find_element_by_css_selector('input')
text = 'Test %s %s' % (item_type, index)
label.send_keys(text)
results.append(text)
self.studio_save()
self.go_to_page(page_name, css_selector='div.poll-block')
answers = [element.text for element in self.browser.find_elements_by_css_selector(answer_css_selector)]
self.assertEqual(answers[-2:], results)
tests/integration/xml/poll_all_pictures.xml
<vertical_demo>
<poll tally='{"red": 20, "fennec": 29, "kit": 15, "arctic" : 35}'
question="## What is your favorite kind of fox?"
answers='[["red", {"label": "Red Fox", "img": "../img/red_fox.png"}], ["fennec", {"label": "Fennec Fox", "img": "../img/fennec_fox.png"}], ["kit", {"label": "Kit Fox", "img": "../img/kit_fox.png"}], ["arctic", {"label": "Arctic fox", "img": "../img/arctic_fox.png"}]]' />
</vertical_demo>
<poll tally='{"red": 20, "fennec": 29, "kit": 15, "arctic" : 35}'
question="## What is your favorite kind of fox?"
answers='[["red", {"label": "Red Fox", "img": "../img/red_fox.png"}], ["fennec", {"label": "Fennec Fox", "img": "../img/fennec_fox.png"}], ["kit", {"label": "Kit Fox", "img": "../img/kit_fox.png"}], ["arctic", {"label": "Arctic fox", "img": "../img/arctic_fox.png"}]]' />
tests/integration/xml/poll_defaults.xml
<vertical_demo>
<poll url_name="defaults"/>
</vertical_demo>
\ No newline at end of file
<poll url_name="defaults"/>
tests/integration/xml/poll_functions.xml
<vertical_demo>
<poll tally="{'long': 20, 'short': 29, 'not_saying': 15, 'longer' : 35}"
question="## How long have you been studying with us?"
answers='[["long", {"label": "A very long time", "img": null}], ["short", {"label": "Not very long", "img": null}], ["not_saying", {"label": "I shall not say", "img": null}], ["longer", {"label": "Longer than you", "img": null}]]'
feedback="### Thank you&#10;&#10;for being a valued student."/>
</vertical_demo>
<poll tally="{'long': 20, 'short': 29, 'not_saying': 15, 'longer' : 35}"
question="## How long have you been studying with us?"
answers='[["long", {"label": "A very long time", "img": null}], ["short", {"label": "Not very long", "img": null}], ["not_saying", {"label": "I shall not say", "img": null}], ["longer", {"label": "Longer than you", "img": null}]]'
feedback="### Thank you&#10;&#10;for being a valued student."/>
tests/integration/xml/poll_markdown.xml
<vertical_demo>
<poll url_name="markdown" question="## This is a test&#10;&#10;&lt;h1&gt;This is only a &amp;gt;&amp;lt;test&lt;/h1&gt;&#10;&#10;* One&#10;* Two&#10;* Three&#10;&#10;1. First&#10;2. Second&#10;3. Third&#10;&#10;We shall find out if markdown is respected.&#10;&#10;&gt; &quot;I have not yet begun to code.&quot;"
feedback="### This is some feedback&#10;&#10;[This is a link](http://www.example.com)&#10;&#10;&lt;a href=&quot;http://www.example.com&quot; target=&quot;_blank&quot;&gt;This is also a link.&lt;/a&gt;&#10;&#10;This is a paragraph with *emphasized* and **bold** text, and **_both_**."
answers='[["long", {"label": "I *feel* like this test will **pass**&lt;code&gt;test&lt;/code&gt;.", "img": null}]]'/>
</vertical_demo>
<poll url_name="markdown" question="## This is a test&#10;&#10;&lt;h1&gt;This is only a &amp;gt;&amp;lt;test&lt;/h1&gt;&#10;&#10;* One&#10;* Two&#10;* Three&#10;&#10;1. First&#10;2. Second&#10;3. Third&#10;&#10;We shall find out if markdown is respected.&#10;&#10;&gt; &quot;I have not yet begun to code.&quot;"
feedback="### This is some feedback&#10;&#10;[This is a link](http://www.example.com)&#10;&#10;&lt;a href=&quot;http://www.example.com&quot; target=&quot;_blank&quot;&gt;This is also a link.&lt;/a&gt;&#10;&#10;This is a paragraph with *emphasized* and **bold** text, and **_both_**."
answers='[["long", {"label": "I *feel* like this test will **pass**&lt;code&gt;test&lt;/code&gt;.", "img": null}]]'/>
tests/integration/xml/poll_one_picture.xml
<vertical_demo>
<poll tally="{'red': 20, 'fennec': 29, 'kit': 15, 'arctic' : 35}"
question="## What is your favorite kind of fox?"
answers="[['red', {'label': 'Red Fox', 'img': None}], ['fennec', {'label': 'Fennec Fox', 'img': '../img/fennec_fox.png'}], ['kit', {'label': 'Kit Fox', 'img': None}], ['arctic', {'label': 'Arctic fox', 'img': None}]]" />
</vertical_demo>
\ No newline at end of file
<poll tally="{'red': 20, 'fennec': 29, 'kit': 15, 'arctic' : 35}"
question="## What is your favorite kind of fox?"
answers='[["red", {"label": "Red Fox", "img": null}], ["fennec", {"label": "Fennec Fox", "img": "../img/fennec_fox.png"}], ["kit", {"label": "Kit Fox", "img": null}], ["arctic", {"label": "Arctic fox", "img": null}]]' />
tests/integration/xml/poll_studio.xml 0 → 100644
<poll tally="{'long': 20, 'short': 29, 'not_saying': 15, 'longer' : 35}"
question="## How long have you been studying with us?"
answers='[["long", {"label": "A very long time", "img": null}], ["short", {"label": "Not very long", "img": null}], ["not_saying", {"label": "I shall not say", "img": null}], ["longer", {"label": "Longer than you", "img": null}]]'
choice="short"
feedback="### Thank you&#10;&#10;for being a valued student."/>
tests/integration/xml/survey_defaults.xml
<vertical_demo>
<survey url_name="defaults"/>
</vertical_demo>
<survey url_name="defaults"/>
tests/integration/xml/survey_functions.xml
<vertical_demo>
<survey tally='{"q1": {"sa": 5, "a": 5, "n": 3, "d": 2, "sd": 5}, "q2": {"sa": 3, "a": 2, "n": 3, "d": 10, "sd": 2}, "q3": {"sa": 2, "a": 7, "n": 1, "d": 4, "sd": 6}, "q4": {"sa": 1, "a": 2, "n": 8, "d": 4, "sd": 5}}'
questions='[["q1", {"label": "I feel like this test will pass.", "img": null}], ["q2", {"label": "I like testing software", "img": null}], ["q3", {"label": "Testing is not necessary", "img": null}], ["q4", {"label": "I would fake a test result to get software deployed.", "img": null}]]'
answers='[["sa", "Strongly Agree"], ["a", "Agree"], ["n", "Neutral"], ["d", "Disagree"], ["sd", "Strongly Disagree"]]'
feedback="### Thank you&#10;&#10;for running the tests."/>
</vertical_demo>
<survey tally='{"q1": {"sa": 5, "a": 5, "n": 3, "d": 2, "sd": 5}, "q2": {"sa": 3, "a": 2, "n": 3, "d": 10, "sd": 2}, "q3": {"sa": 2, "a": 7, "n": 1, "d": 4, "sd": 6}, "q4": {"sa": 1, "a": 2, "n": 8, "d": 4, "sd": 5}}'
questions='[["q1", {"label": "I feel like this test will pass.", "img": null}], ["q2", {"label": "I like testing software", "img": null}], ["q3", {"label": "Testing is not necessary", "img": null}], ["q4", {"label": "I would fake a test result to get software deployed.", "img": null}]]'
answers='[["sa", "Strongly Agree"], ["a", "Agree"], ["n", "Neutral"], ["d", "Disagree"], ["sd", "Strongly Disagree"]]'
feedback="### Thank you&#10;&#10;for running the tests."/>
tests/integration/xml/survey_markdown.xml
<vertical_demo>
<survey url_name="markdown" questions='[["q1", {"label": "I *feel* like this test will **pass**&lt;code&gt;test&lt;/code&gt;.", "img": null}]]' feedback="### This is some feedback&#10;&#10;[This is a link](http://www.example.com)&#10;&#10;&lt;a href=&quot;http://www.example.com&quot; target=&quot;_blank&quot;&gt;This is also a link.&lt;/a&gt;&#10;&#10;This is a paragraph with *emphasized* and **bold** text, and **_both_**." />
</vertical_demo>
<survey url_name="markdown" questions='[["q1", {"label": "I *feel* like this test will **pass**&lt;code&gt;test&lt;/code&gt;.", "img": null}]]' feedback="### This is some feedback&#10;&#10;[This is a link](http://www.example.com)&#10;&#10;&lt;a href=&quot;http://www.example.com&quot; target=&quot;_blank&quot;&gt;This is also a link.&lt;/a&gt;&#10;&#10;This is a paragraph with *emphasized* and **bold** text, and **_both_**." />
tests/integration/xml/survey_studio.xml 0 → 100644
<survey tally='{"q1": {"sa": 5, "a": 5, "n": 3, "d": 2, "sd": 5}, "q2": {"sa": 3, "a": 2, "n": 3, "d": 10, "sd": 2}, "q3": {"sa": 2, "a": 7, "n": 1, "d": 4, "sd": 6}, "q4": {"sa": 1, "a": 2, "n": 8, "d": 4, "sd": 5}}'
questions='[["q1", {"label": "I feel like this test will pass.", "img": null}], ["q2", {"label": "I like testing software", "img": null}], ["q3", {"label": "Testing is not necessary", "img": null}], ["q4", {"label": "I would fake a test result to get software deployed.", "img": null}]]'
answers='[["sa", "Strongly Agree"], ["a", "Agree"], ["n", "Neutral"], ["d", "Disagree"], ["sd", "Strongly Disagree"]]'
feedback="### Thank you&#10;&#10;for running the tests."/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment