Skip to content

End-to-end bok choy test for cohorted courseware. - #6540

Merged
cahrens merged 1 commit into
dan-f/cohort-group-configurations-pagefrom
christina/cohorted-courseware-end-to-end-test
Jan 13, 2015
Merged

End-to-end bok choy test for cohorted courseware.#6540
cahrens merged 1 commit into
dan-f/cohort-group-configurations-pagefrom
christina/cohorted-courseware-end-to-end-test

Conversation

@cahrens

@cahrens cahrens commented Jan 10, 2015

Copy link
Copy Markdown

@dan-f and @andy-armstrong this is ready for review. It has already passed once (https://jenkins.testeng.edx.org/job/edx-all-tests-auto-pr/21383/).

Note that there are some quality violations that I'm picking up from Dan's branch.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Note to reviewers: these changes were taken from #6283, which has not yet merged to master.

@cahrens
cahrens force-pushed the christina/cohorted-courseware-end-to-end-test branch from e712ea0 to 3804bd2 Compare January 10, 2015 20:09

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Note to reviewers: when I wrote this test, I followed the pattern of other tests in the file that put problems directly under subsections. I have changed it now to represent the structure that would be created by Studio (problems in a unit).

Because of that, I can't use course_nav.sequence_items, which only returns the display name of the first component on that page (which would be the unit display name). If I put each problem into its own unit it also doesn't work because all students will see each unit, even if it has no content for a particular student.

@dan-f
dan-f force-pushed the dan-f/cohort-group-configurations-page branch from 20850ff to 4c7ae01 Compare January 11, 2015 18:10
@cahrens
cahrens force-pushed the christina/cohorted-courseware-end-to-end-test branch from 3804bd2 to fb92e96 Compare January 12, 2015 18:10
@cahrens

cahrens commented Jan 12, 2015

Copy link
Copy Markdown
Author

@dan-f responded to your feedback. I also needed to rebase on your branch, so your comments were lost in the force push (they were on a specific commit). I renamed the method as you requested, but didn't do the list comprehension thingy as I find that syntax too difficult to remember/understand.

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.

You could collapse the above three blocks by iterating over [(self.cohort_a_student_username, self.cohort_a_student_email), (self.cohort_b_student_username, self.cohort_b_student_email), (self.cohort_default_student_username, self.cohort_default_student_email)].

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I still have to define the variables, so the only thing it would impact is the call to StudioAutoAuthPage. Does not seem worth it to me, as it makes the code less readable.

@dan-f

dan-f commented Jan 12, 2015

Copy link
Copy Markdown
Contributor

Awesome! 👍

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 this would be easier to read if you called it all_xblock_components_contain_strings. It wasn't clear to me in the usages that they all had to be true, so I had to come back to the doc string to check.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Removed the method, added helper method with more helpful asserts in one of the test classes.

@andy-armstrong

Copy link
Copy Markdown
Contributor

👍 Fantastic tests, as always.

@cahrens
cahrens force-pushed the christina/cohorted-courseware-end-to-end-test branch from fb92e96 to fa221ea Compare January 12, 2015 22:42
@cahrens

cahrens commented Jan 13, 2015

Copy link
Copy Markdown
Author

@andy-armstrong and @dan-f I responded to your feedback, squashed, and got a green build. Since I already got thumbs-ups, I will go ahead and merge this. If you look the commit over and have any issues, let me know and I will follow up.

cahrens pushed a commit that referenced this pull request Jan 13, 2015
…o-end-test

End-to-end bok choy test for cohorted courseware.
@cahrens
cahrens merged commit c39e3b7 into dan-f/cohort-group-configurations-page Jan 13, 2015
@cahrens
cahrens deleted the christina/cohorted-courseware-end-to-end-test branch January 13, 2015 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants