Skip to content

Feature/cdodge/allow course run in course create - #510

Merged
chrisndodge merged 27 commits into
masterfrom
feature/cdodge/allow-course-run-in-course-create
Jul 31, 2013
Merged

Feature/cdodge/allow course run in course create#510
chrisndodge merged 27 commits into
masterfrom
feature/cdodge/allow-course-run-in-course-create

Conversation

@chrisndodge

Copy link
Copy Markdown
Contributor

No description provided.

@chrisndodge

Copy link
Copy Markdown
Contributor Author

Running unit tests/acceptance tests now.

@cahrens @talbs, can you review?

@cahrens

cahrens commented Jul 29, 2013

Copy link
Copy Markdown

@chrisndodge merge conflict (probably changelog file).

@chrisndodge

Copy link
Copy Markdown
Contributor Author

@cahrens frances is taking a look at the merge conflict. Can you continue the review?

Comment thread cms/static/js/base.js Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Need to put var before variable (else they are global).

@chrisndodge

Copy link
Copy Markdown
Contributor Author

@cahrens there are no new BDD tests for failure cases. I updated existing tests for the 'happy path'.

Comment thread cms/static/js/base.js Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why display_name_errMsg here?

@cahrens

cahrens commented Jul 29, 2013

Copy link
Copy Markdown

Would like to see BDD spec covering all the error cases. By BDD spec, I mean a wiki page spec with the correct tag so it shows up here: https://edx-wiki.atlassian.net/wiki/display/STU/Studio+BDD+Specs+index?src=search.

Extend existing Selenium tests to cover some or all of the error cases (depending on complexity of the setup).

Comment thread cms/static/js/base.js Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Implicitly declared global var.

@chrisndodge

Copy link
Copy Markdown
Contributor Author

@cahrens @markchang

I spent a little time looking at writing Lettuce/BDD specs. In short, I'm not going to be able to do this as I'm behind on other commitments and I need to timebox my time here.

So can you two huddle and decide if you want to move ahead with this merge or wait for Lettuce tests for the failure cases. If the latter, then this will have to get re-assigned.

@talbs

talbs commented Jul 30, 2013

Copy link
Copy Markdown
Contributor

@frrrances this looks solid from my perspective. Nice work. I did abstract out some of the shared rules for primary/secondary actions within forms.scss quickly.

Aside from that, we'll just need to sync this up with the "admin rights" branch (https://github.com/edx/edx-platform/pull/470) work that extends (showing/hiding create in-context forms with animations) some of this work. More of a reminder for me/you, depending on what gets merged to master first.

👍

@cahrens

cahrens commented Jul 30, 2013

Copy link
Copy Markdown

I feel strongly that we need, at a minimum, a manual BDD spec (wiki page) covering the error cases. See https://edx-wiki.atlassian.net/wiki/display/STU/Studio+BDD+Specs+index?src=search. Maybe @frrrances could help with this? We said in Studio retro that we wanted to get back to requiring this for features.

Personally, I still hate this error message: "Either of organization or course number must be unique".

@chrisndodge

Copy link
Copy Markdown
Contributor Author

@cahrens yes, that is poor english. I'll change.

@chrisndodge

Copy link
Copy Markdown
Contributor Author

@cahrens updated error message.

@cahrens

cahrens commented Jul 30, 2013

Copy link
Copy Markdown

👍 Once we have the BDD (manual) spec. It should only take someone about 15 minutes to write that up.

@talbs

talbs commented Jul 30, 2013

Copy link
Copy Markdown
Contributor

@frrrances and @chrisndodge, thanks for your help. I've done a couple of things:

  1. Rebased onto master and resolved all of the known FED conflicts caused between the new user form (within manage_users.html) work and this branch's changes.
  2. Synced up HTML and Sass standards used for both the new user and new course forms.

The latter involved tweaking the related course creation functions in base.js (mostly DOM selectors and HTML class management). I was able to create a course properly locally as well as make sure validation was working. Can you two confirm on your end that this still works as intended and I didn't muck up any tests?

@frrrances, also, this form has the styling support to animate its height in. But there are some visual things I want to walk through with you, so the class that triggers/manages that (.animate) on the form's wrapper is removed for now. Let's chat tomorrow quickly about it.

Let me know if you have any questions and remember to pull with the rebase in mind. Thanks again.

@chrisndodge

Copy link
Copy Markdown
Contributor Author

hmm. interesting. Tests here (Jenkins) are passing but 'rake test_cms' is failing for me locally (some I18N test). Looking more...

@chrisndodge

Copy link
Copy Markdown
Contributor Author

@frrrances do you mind trying 'rake test_cms' on your localdev and see if it passes or fails? I'm still getting errors in the internationalization tests. I'm wondering if there is some malformed HTML in a page response.

@chrisndodge
chrisndodge deleted the feature/cdodge/allow-course-run-in-course-create branch July 31, 2013 19:21
@chrisndodge
chrisndodge restored the feature/cdodge/allow-course-run-in-course-create branch July 31, 2013 19:21
@chrisndodge chrisndodge reopened this Jul 31, 2013
@chrisndodge

Copy link
Copy Markdown
Contributor Author

Waiting for build to complete before merging....

@chrisndodge

Copy link
Copy Markdown
Contributor Author

Tests pass, but master is above PEP8 limit. Will OK'd merging this.

chrisndodge pushed a commit that referenced this pull request Jul 31, 2013
…ourse-create

Feature/cdodge/allow course run in course create
@chrisndodge
chrisndodge merged commit 8573ac3 into master Jul 31, 2013
@chrisndodge
chrisndodge deleted the feature/cdodge/allow-course-run-in-course-create branch August 8, 2013 18:41
chrisrossi pushed a commit to jazkarta/edx-platform that referenced this pull request Mar 31, 2014
diegomillan pushed a commit to eduNEXT/edx-platform that referenced this pull request Sep 14, 2016
…ltrics-xblock

Update SHA of qualtrics XBlock
yoann-mroz pushed a commit to weuplearning/edx-platform that referenced this pull request Nov 30, 2020
Sujeet1379 pushed a commit to chandrudev/edx-platform that referenced this pull request Nov 17, 2022
Danyal-Faheem pushed a commit to Danyal-Faheem/edx-platform that referenced this pull request Sep 1, 2025
@farhan farhan added the depr Proposal for deprecation & removal per OEP-21 label Jun 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

depr Proposal for deprecation & removal per OEP-21

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants