Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DTL (Test > Levelbuilder) #13815

Merged
merged 87 commits into from
Mar 15, 2017
Merged

DTL (Test > Levelbuilder) #13815

merged 87 commits into from
Mar 15, 2017

Commits on Mar 8, 2017

  1. Add api for filtering pd_workshops

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    377e1c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. PR feedback

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    52e71a7 View commit details
    Browse the repository at this point in the history

  2. Fix broken test

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    9b9d07f View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2017

  1. Add controller test helpers to generate common test cases. DRY up the… 

    … PD controller tests
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    e9a6de6 View commit details
    Browse the repository at this point in the history

  2. Intro to Web Lab videos 

    Adding intro to web lab 1, 2, and 3 videos
    Josh Caldwell committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    c62def4 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2017

  1. Refactored from PR feedback to be more readable

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    e312e7f View commit details
    Browse the repository at this point in the history

  2. Make test_user_gets_response_for description more accurate

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    9cd05d3 View commit details
    Browse the repository at this point in the history

  3. Populate LevelConceptDifficulty fixture to fix assert_nil warning 

    Before adding this fixture, "level_concept_difficulty uses preloading" in `ScriptTest` only compared nil to nil.
    @joshlory
    joshlory committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    a846b9c View commit details
    Browse the repository at this point in the history

  4. Clean up typos leftover from refactor, and fix broken tests

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    b84a5a0 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. Ensure level_concept_difficulty isn't nil

    @joshlory
    joshlory committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    cbd9b38 View commit details
    Browse the repository at this point in the history

  2. Don't just compare references

    @joshlory
    joshlory committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    9ee1802 View commit details
    Browse the repository at this point in the history

  3. Use the script cache

    @joshlory
    joshlory committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    4089c16 View commit details
    Browse the repository at this point in the history

  4. proxy requests to docs.code.org through studio

    @Bjvanminnen
    Bjvanminnen committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    ce5b27b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Merge branch 'staging' into dryer-tests

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    af47f0f View commit details
    Browse the repository at this point in the history

  2. Add @examples to test helper documentation

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    a93913e View commit details
    Browse the repository at this point in the history

  3. Fix payment report bug that broke when it encountered counselor and a… 

    …dmin workshops.
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    f4aa2de View commit details
    Browse the repository at this point in the history

  4. Change phase 2 online course text in workshop enrollment teacher emai… 

    …l, and move details below logistics [ci skip]
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    68c6f02 View commit details
    Browse the repository at this point in the history

  5. Teacher announcements: add CSF pilot & remove teacher recruitment

    @breville
    breville committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    86cd405 View commit details
    Browse the repository at this point in the history

  6. Data validation for contact rollups

    Jeremy Stone committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    2a11afe View commit details
    Browse the repository at this point in the history

  7. address some code review and add a basic test

    @Bjvanminnen
    Bjvanminnen committed Mar 14, 2017
    1 Configuration menu
    Copy the full SHA
    58f2e89 View commit details
    Browse the repository at this point in the history

  8. Rollback details / logistic reorder in email. [ci skip]

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    6a6fb79 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #13775 from code-dot-org/proxyDocs 

    proxy requests to docs.code.org through studio
    @Bjvanminnen
    Bjvanminnen committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    038a30a View commit details
    Browse the repository at this point in the history

  10. Merge pull request #13748 from code-dot-org/fix-assert-nil-concept-di… 

    …fficulty-test

Populate LevelConceptDifficulty fixture to fix assert_nil warning
    @joshlory
    joshlory committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    ed9f706 View commit details
    Browse the repository at this point in the history

  11. Use namespaced npm package for JS-Interpreter

    @pcardune
    pcardune committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    8727e0d View commit details
    Browse the repository at this point in the history

  12. Refactor #wait_with_timeout.until to #wait_until 

    Add known-error handling to #wait_until
This should reduce UI test flakiness when waiting for an element
through a page load.
    @wjordan
    wjordan committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    4d7dc2b View commit details
    Browse the repository at this point in the history

  13. PR feedback

    Jeremy Stone committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    3eb5022 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #13781 from code-dot-org/pd-workshop-email-online-… 

    …update

Change phase 2 online course text in workshop enrollment teacher email
    @aoby
    aoby committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    4a96943 View commit details
    Browse the repository at this point in the history

  15. Update comment [ci skip]

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    c4cd100 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #13779 from code-dot-org/pd-payment-report-fix 

    Fix payment report bug that broke when it encountered counselor and admin workshops.
    @aoby
    aoby committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    4643af7 View commit details
    Browse the repository at this point in the history

  17. fix rubocop error

    @Bjvanminnen
    Bjvanminnen committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    20df0ea View commit details
    Browse the repository at this point in the history

  18. Merge pull request #13788 from code-dot-org/lintFix 

    fix rubocop error
    @Bjvanminnen
    Bjvanminnen committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    4a29009 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #13734 from code-dot-org/dryer-tests 

    Add controller test helpers to generate common test cases.
    @aoby
    aoby committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    8e46bed View commit details
    Browse the repository at this point in the history

  20. Teacher announcement: tidy up string

    @breville
    breville committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    e2e3049 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #13782 from code-dot-org/teacher-announcement-csf-… 

    …pilot

Teacher announcements: add CSF pilot & remove teacher recruitment
    @breville
    breville committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    213b47a View commit details
    Browse the repository at this point in the history

  22. remove some more references to jsinterpreter

    @pcardune
    pcardune committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    6c21caf View commit details
    Browse the repository at this point in the history

  23. Merge pull request #13783 from code-dot-org/contact_rollups_validation 

    Add data validation for contact rollups
    jeremydstone committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    736e724 View commit details
    Browse the repository at this point in the history

  24. Navigate to the cancel page when cancelling enrollments. This gives t… 

    …he user the ability to cancel the enrollment
    @mehalshah
    mehalshah committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    fdadc06 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #13787 from code-dot-org/wait_until 

    Refactor #wait_with_timeout.until to #wait_until
    @wjordan
    wjordan committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    cbf766a View commit details
    Browse the repository at this point in the history

  26. Add retry on UI-test page load errors

    @wjordan
    wjordan committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    f994840 View commit details
    Browse the repository at this point in the history

  27. Fix missing error and * on how heard other field [ci skip]

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    50e9c60 View commit details
    Browse the repository at this point in the history

  28. Fix use of acorn global

    @pcardune
    pcardune committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    d6b8abf View commit details
    Browse the repository at this point in the history

  29. Merge pull request #13784 from code-dot-org/pcardune-interpreter-tests 

    Use namespaced npm package for JS-Interpreter
    @pcardune
    pcardune committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    6b43b1a View commit details
    Browse the repository at this point in the history

  30. Merge pull request #13791 from code-dot-org/workshop-ca-survey-other-… 

    …required-fix

Fix missing error and * on how heard other field
    @aoby
    aoby committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    9464e08 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #13795 from code-dot-org/levelbuilder

    @wjordan
    wjordan committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    b9516e1 View commit details
    Browse the repository at this point in the history

  32. Fix contact rollups bug with Petition Signer educators not getting ma… 

    …rked in Teacher role
    Jeremy Stone committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    f83e2f4 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'staging' into pd-workshop-filters-api

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    2b62751 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #13790 from code-dot-org/ui-502-retry 

    Add retry on UI-test page load errors
    @wjordan
    wjordan committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    767312a View commit details
    Browse the repository at this point in the history

  35. Step-mode UI test fixes

    @wjordan
    wjordan committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    fa13ca2 View commit details
    Browse the repository at this point in the history

  36. Add flexible order param and subject to workshop filters and remove d… 

    …ate_order.

Add CSV download support to workshop filters controller.
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    4166110 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2017

  1. Merge pull request #13743 from code-dot-org/web-lab-videos 

    Intro to Web Lab videos
    @sfilman
    sfilman committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    5a6310f View commit details
    Browse the repository at this point in the history

  2. Fixes to signingIn UI test 

    attempt to reduce flakiness on IE11Win10.
    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    b6b4972 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13797 from code-dot-org/step-mode-ui-test 

    Step-mode UI test fixes
    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    3956560 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #13798 from code-dot-org/signin-ui-fix 

    Fixes to signingIn UI test
    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    d988193 View commit details
    Browse the repository at this point in the history

  5. staging content changes (-will)

    @deploy-code-org
    deploy-code-org committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    3a7ef64 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13799 from code-dot-org/staging

    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    e8e0d59 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #13789 from code-dot-org/cancel_enrollment_navigation 

    Navigate to the cancel page when cancelling enrollments. This gives t…
    @mehalshah
    mehalshah committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    c244973 View commit details
    Browse the repository at this point in the history

  8. Revert "Fixes to signingIn UI test"

    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    30f7954 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #13801 from code-dot-org/revert-13798-signin-ui-fix 

    Revert "Fixes to signingIn UI test"
    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    cfd3319 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #13802 from code-dot-org/staging 

    DTT
    @wjordan
    wjordan committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    0473635 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #13796 from code-dot-org/contact_rollup_teacher_fix 

    Fix contact rollups bug with Petition Signer educators
    jeremydstone committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    407e582 View commit details
    Browse the repository at this point in the history

  12. Reorder code so @user defined.

    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    ecbeac7 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'staging' into pd-workshop-filters-api

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    865505f View commit details
    Browse the repository at this point in the history

  14. Revert "Remove reference to and need for CDO.hip_chat_log_room."

    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    51017aa View commit details
    Browse the repository at this point in the history

  15. Merge pull request #13805 from code-dot-org/revert-13758-removeCdoHip… 

    …ChatLogRoom

Revert "Remove reference to and need for CDO.hip_chat_log_room."
    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    cc101fa View commit details
    Browse the repository at this point in the history

  16. Add test for student_register error.

    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    eac0c2c View commit details
    Browse the repository at this point in the history

  17. Adjust cron times for DST.

    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    8da0fd6 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #13804 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @breville
    breville committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    2159afd View commit details
    Browse the repository at this point in the history

  19. staging content changes (-Brendan)

    @deploy-code-org
    deploy-code-org committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    4e10b3a View commit details
    Browse the repository at this point in the history

  20. Merge pull request #13806 from code-dot-org/fixDstCrons 

    Adjust cron times for DST.
    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    f5baea1 View commit details
    Browse the repository at this point in the history

  21. Updated cookbook versions

    @deploy-code-org
    deploy-code-org committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    0ca72d6 View commit details
    Browse the repository at this point in the history

  22. add location_name attribute to workshop download serializer

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    5d768d1 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #13663 from code-dot-org/pd-workshop-filters-api 

    Add API for filtering pd_workshops
    @aoby
    aoby committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    a607b7e View commit details
    Browse the repository at this point in the history

  24. Merge pull request #13808 from code-dot-org/levelbuilder

    @breville
    breville committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    f3f13d2 View commit details
    Browse the repository at this point in the history

  25. Add pd-workshop filter UI

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    78fa65b View commit details
    Browse the repository at this point in the history

  26. Improve workshop filter UI: 

      - add filter view button to main page
  - turn "N More..." links into buttons
  - main page shows all In Progress workshops, and top 5 of Upcoming and Ended
  - make more responsive, add bootstrap classes on filter page for more screen sizes
  - default filter view to 25 results, option for 50 and all
  - added download CSV button
  - clean up workshop table: don't recreate columns on each render, add
    a configurable caption, and add an onSort callback
  - fix table sort when not all not all rows are loaded to requery
  - add sortable subject
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    56b349d View commit details
    Browse the repository at this point in the history

  27. Create ServerSortWorkshopTable that handles sorting, and use in place… 

    … of existing workshop tables.
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    4dd5571 View commit details
    Browse the repository at this point in the history

  28. PR feedback

    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    a3fcb9b View commit details
    Browse the repository at this point in the history

  29. Merge pull request #13674 from code-dot-org/pd-workshop-filters-ui 

    Add pd-workshop filter UI
    @aoby
    aoby committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    158c9d9 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #13803 from code-dot-org/fixFollowers 

    Reorder code so @user defined.
    @ashercodeorg
    ashercodeorg committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    111c337 View commit details
    Browse the repository at this point in the history

  31. staging content changes (-Brendan)

    @deploy-code-org
    deploy-code-org committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    4ce6619 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s… 

    …taging
    @deploy-code-org
    deploy-code-org committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    3eea74c View commit details
    Browse the repository at this point in the history

  33. Merge pull request #13809 from code-dot-org/staging

    @breville
    breville committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    768ecbc View commit details
    Browse the repository at this point in the history

  34. Move Pardot code to library, update field names

    Jeremy Stone committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    04682a6 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #13810 from code-dot-org/pardot_changes 

    Move Pardot code to library, update field names
    jeremydstone committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    ea07789 View commit details
    Browse the repository at this point in the history

  36. Fix bug introduced by renaming a React prop but not changing the call… 

    …ing code
    Andrew Oberhardt authored and Andrew Oberhardt committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    00d5e8a View commit details
    Browse the repository at this point in the history

  37. Merge pull request #13811 from code-dot-org/pd-workshop-ui-fix 

    Fix bug introduced by renaming a React prop but not changing the calling code
    @aoby
    aoby committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    fd5aa4d View commit details
    Browse the repository at this point in the history

  38. Merge pull request #13812 from code-dot-org/staging 

    DTT (manually)
    @breville
    breville committed Mar 15, 2017
    Configuration menu
    Copy the full SHA
    86b7d1d View commit details
    Browse the repository at this point in the history