Skip to content

Adresses TNL-3096 - #9464

Merged
sarina merged 1 commit into
openedx:masterfrom
mirjamsk:mirjamsk/TNL-3096
Aug 27, 2015
Merged

Adresses TNL-3096#9464
sarina merged 1 commit into
openedx:masterfrom
mirjamsk:mirjamsk/TNL-3096

Conversation

@mirjamsk

Copy link
Copy Markdown
Contributor

@openedx-webhooks

Copy link
Copy Markdown

Thanks for the pull request, @mirjamsk! I've created OSPR-773 to keep track of it in JIRA. JIRA is a place for product owners to prioritize feature reviews by the engineering development teams.

Feel free to add as much of the following information to the ticket:

  • supporting documentation
  • edx-code email threads
  • timeline information ('this must be merged by XX date', and why that is)
  • partner information ('this is a course on edx.org')
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will still be done via the Github pull request interface. As a reminder, our process documentation is here.

We can't start reviewing your pull request until you've submitted a signed contributor agreement or indicated your institutional affiliation and added yourself to the AUTHORS file. Please see the CONTRIBUTING file for more information.

@openedx-webhooks openedx-webhooks added open-source-contribution PR author is not from Axim or 2U needs triage labels Aug 25, 2015
@sarina

sarina commented Aug 25, 2015

Copy link
Copy Markdown
Contributor

Hi @mirjamsk and welcome!

We'll need to know your institutional affiliation or have a contributor's agreement on file for you, as the bot mentions.

@Colin-Fredericks filed this bug; perhaps youd like to be the first reviewer, Colin?

@openedx-webhooks openedx-webhooks added waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed needs triage labels Aug 25, 2015
@mirjamsk

Copy link
Copy Markdown
Contributor Author

hi @sarina, i've just sent the signed contributor's agreement to legal@edx.org

Comment thread common/lib/xmodule/xmodule/capa_base.py Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add some comments here to explain what you're doing and why.

@openedx-webhooks openedx-webhooks added community manager review and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Aug 25, 2015
@sarina

sarina commented Aug 25, 2015

Copy link
Copy Markdown
Contributor

This still doesn't work for me; I'm using the example from the TNL-3096 description.

screen shot 2015-08-25 at 2 12 50 pm

screen shot 2015-08-25 at 2 13 39 pm

@openedx-webhooks openedx-webhooks added waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed community manager review labels Aug 25, 2015
@Colin-Fredericks

Copy link
Copy Markdown
Contributor

It seems like the change in the code doesn't address the issue - whatever was stripping out the HTML, it's still there somewhere else.

@sarina

sarina commented Aug 25, 2015

Copy link
Copy Markdown
Contributor

Mirjam: You should write a test case that fails on the current version of
the code, perhaps using the example code from the ticket.

On Tue, Aug 25, 2015 at 2:24 PM, Colin-Fredericks notifications@github.com
wrote:

It seems like the change in the code doesn't address the issue - whatever
was stripping out the HTML, it's still there somewhere else.


Reply to this email directly or view it on GitHub
https://github.com/edx/edx-platform/pull/9464#issuecomment-134693109.

@mirjamsk

Copy link
Copy Markdown
Contributor Author

@sarina, @Colin-Fredericks i committed and pushed the changes which address the stated issues

@sarina

sarina commented Aug 26, 2015

Copy link
Copy Markdown
Contributor

jenkins run all

@sarina

sarina commented Aug 26, 2015

Copy link
Copy Markdown
Contributor

@Colin-Fredericks could you take a pass at reviewing this? I'm out of the office for most of today.

@openedx-webhooks openedx-webhooks added community manager review and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Aug 26, 2015
@Colin-Fredericks

Copy link
Copy Markdown
Contributor

I'll see what I can do.

Comment thread common/lib/capa/capa/tests/test_util.py Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you want to name this "test_get_inner...."

@Colin-Fredericks

Copy link
Copy Markdown
Contributor

Ok - have tried this out on my local devstack.

Good news: It mostly works! I've only checked MC questions so far, but it's encouraging.

Only slightly bad news: If your hint starts with a tag, it doesn't work. For instance, if your hint is entirely an image, that doesn't work, but it definitely should. Adding a single space doesn't make it work, but adding some text beforehand does. Adding text after the tag doesn't work.

Strangely, that's only true for the check hints (the inline, answer-specific ones) - not for the demand hints (the ones you get from clicking the "Hint" button). Demand hints can be just an image tag and it works just fine.

Actually bad news: Your changes are causing a test failure in test_hint_functionality.py, which you definitely want to resolve.

@mirjamsk

Copy link
Copy Markdown
Contributor Author

@Colin-Fredericks thank you for the feedback.
The tests in test_hint_functionality.py were failing due to difference in encoding of symbols.
e.g. the new function encodes the greek symbol Ω as the html variant Ω
i've changed the tests to take this into account.
i'll take a look at the img situation now

@sarina

sarina commented Aug 26, 2015

Copy link
Copy Markdown
Contributor

if your hint is entirely an image, that doesn't work, but it definitely should

I disagree with this; this would not be accessible.

@sarina

sarina commented Aug 26, 2015

Copy link
Copy Markdown
Contributor

To understand the output of your builds, see https://openedx.atlassian.net/wiki/display/TE/Jenkins+Guide

Particularly you have a quality issue which is why your quality build is failing.

@Colin-Fredericks

Copy link
Copy Markdown
Contributor

All images should have alt text, which a screen reader should be able to get at just fine. I will happily bow to the accessibility team on this one, though.

The issue also comes up for other tags, such as a span, so it's still worth addressing.

@sarina

sarina commented Aug 26, 2015

Copy link
Copy Markdown
Contributor

Sure, I just don't want to recommend that course teams do this because we
don't have a way of enforcing an alt tag.

On Wed, Aug 26, 2015 at 11:12 AM, Colin-Fredericks <notifications@github.com

wrote:

All images should have alt text, which a screen reader should be able to
get at just fine. I will happily bow to the accessibility team on this one,
though.

The issue also comes up for other tags, such as a span, so it's still
worth addressing.


Reply to this email directly or view it on GitHub
https://github.com/edx/edx-platform/pull/9464#issuecomment-135056634.

@openedx-webhooks openedx-webhooks added waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed community manager review labels Aug 26, 2015
@mirjamsk

Copy link
Copy Markdown
Contributor Author

@Colin-Fredericks changes have been made so it works as expected when adding a tag immediately after the open hint tags

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make this clearer as to what this test case is testing?

@sarina

sarina commented Aug 27, 2015

Copy link
Copy Markdown
Contributor

@mirjamsk I'm 👍 on this once you've responded to my last few comments and squashed your commits.

@Colin-Fredericks could you do a review pass as well (at least making sure this has fully addressed your needs, perhaps also looking at the code a little if you're able?)

Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
@mirjamsk

Copy link
Copy Markdown
Contributor Author

comments addressed and commits squashed

@sarina

sarina commented Aug 27, 2015

Copy link
Copy Markdown
Contributor

@mirjamsk great! Once Colin has given his approval I will merge this.

I appreciate your hard work and fast turn around!

@sarina

sarina commented Aug 27, 2015

Copy link
Copy Markdown
Contributor

@mhoeber FYI. I don't think this has doc impact because it fixes an existing bug that so far only Colin has reported.
(replaced @lamagnifica with @mhoeber -- Alison Hodges 27 Aug 15)

@mhoeber

mhoeber commented Aug 27, 2015

Copy link
Copy Markdown
Contributor

@sarina thanks. doc is ok (never said you couldn't use other tags). noted in release notes list to include when merged

@Colin-Fredericks

Copy link
Copy Markdown
Contributor

I took another look through the code, then double-checked on my devstack to make sure it would work in certain unexpected cases because I know (from personal experience) that parsing HTML with regex is often counter-indicated. Luckily everything works fine.

Thanks for fixing this so quickly!

👍

sarina added a commit that referenced this pull request Aug 27, 2015
@sarina
sarina merged commit 406c9bc into openedx:master Aug 27, 2015
@cahrens

cahrens commented Sep 3, 2015

Copy link
Copy Markdown

@mirjamsk Since this PR was merged, we have been seeing a flaky acceptance test failure. Would you be able to investigate this?

https://openedx.atlassian.net/browse/TNL-3183

@mirjamsk

mirjamsk commented Sep 3, 2015

Copy link
Copy Markdown
Contributor Author

@cahrens this issue has been addressed here https://github.com/edx/edx-platform/pull/9571

@sarina

sarina commented Sep 3, 2015

Copy link
Copy Markdown
Contributor

Christina I would be grateful if you want to review that pr :)
On Sep 3, 2015 5:42 PM, "mirjamsk" notifications@github.com wrote:

@cahrens https://github.com/cahrens this issue has been addressed here #9571
(comment)
https://github.com/edx/edx-platform/pull/9571#issuecomment-137142080


Reply to this email directly or view it on GitHub
https://github.com/edx/edx-platform/pull/9464#issuecomment-137582248.

@cahrens

cahrens commented Sep 4, 2015

Copy link
Copy Markdown

@sarina I'm on vacation until the 15th and didn't review the original PR (so I don't have context for the fix).

@mirjamsk thanks so much for the quick fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

open-source-contribution PR author is not from Axim or 2U waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants