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.

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

DTL (Test > Levelbuilder) #13815

Merged
merged 87 commits into from
Mar 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
377e1c6
Add api for filtering pd_workshops
Mar 8, 2017
52e71a7
PR feedback
Mar 9, 2017
9b9d07f
Fix broken test
Mar 9, 2017
e9a6de6
Add controller test helpers to generate common test cases. DRY up the…
Mar 10, 2017
c62def4
Intro to Web Lab videos
Mar 10, 2017
e312e7f
Refactored from PR feedback to be more readable
Mar 11, 2017
9cd05d3
Make test_user_gets_response_for description more accurate
Mar 11, 2017
a846b9c
Populate LevelConceptDifficulty fixture to fix assert_nil warning
joshlory Mar 11, 2017
b84a5a0
Clean up typos leftover from refactor, and fix broken tests
Mar 11, 2017
cbd9b38
Ensure `level_concept_difficulty` isn't nil
joshlory Mar 13, 2017
9ee1802
Don't just compare references
joshlory Mar 13, 2017
4089c16
Use the script cache
joshlory Mar 13, 2017
ce5b27b
proxy requests to docs.code.org through studio
Bjvanminnen Mar 13, 2017
af47f0f
Merge branch 'staging' into dryer-tests
Mar 14, 2017
a93913e
Add @examples to test helper documentation
Mar 14, 2017
f4aa2de
Fix payment report bug that broke when it encountered counselor and a…
Mar 14, 2017
68c6f02
Change phase 2 online course text in workshop enrollment teacher emai…
Mar 14, 2017
86cd405
Teacher announcements: add CSF pilot & remove teacher recruitment
breville Mar 14, 2017
2a11afe
Data validation for contact rollups
Mar 14, 2017
58f2e89
address some code review and add a basic test
Bjvanminnen Mar 14, 2017
6a6fb79
Rollback details / logistic reorder in email. [ci skip]
Mar 14, 2017
038a30a
Merge pull request #13775 from code-dot-org/proxyDocs
Bjvanminnen Mar 14, 2017
ed9f706
Merge pull request #13748 from code-dot-org/fix-assert-nil-concept-di…
joshlory Mar 14, 2017
8727e0d
Use namespaced npm package for JS-Interpreter
pcardune Mar 14, 2017
4d7dc2b
Refactor #wait_with_timeout.until to #wait_until
wjordan Mar 14, 2017
3eb5022
PR feedback
Mar 14, 2017
4a96943
Merge pull request #13781 from code-dot-org/pd-workshop-email-online-…
aoby Mar 14, 2017
c4cd100
Update comment [ci skip]
Mar 14, 2017
4643af7
Merge pull request #13779 from code-dot-org/pd-payment-report-fix
aoby Mar 14, 2017
20df0ea
fix rubocop error
Bjvanminnen Mar 14, 2017
4a29009
Merge pull request #13788 from code-dot-org/lintFix
Bjvanminnen Mar 14, 2017
8e46bed
Merge pull request #13734 from code-dot-org/dryer-tests
aoby Mar 14, 2017
e2e3049
Teacher announcement: tidy up string
breville Mar 14, 2017
213b47a
Merge pull request #13782 from code-dot-org/teacher-announcement-csf-…
breville Mar 14, 2017
6c21caf
remove some more references to jsinterpreter
pcardune Mar 14, 2017
736e724
Merge pull request #13783 from code-dot-org/contact_rollups_validation
Mar 14, 2017
fdadc06
Navigate to the cancel page when cancelling enrollments. This gives t…
mehalshah Mar 14, 2017
cbf766a
Merge pull request #13787 from code-dot-org/wait_until
wjordan Mar 14, 2017
f994840
Add retry on UI-test page load errors
wjordan Mar 14, 2017
50e9c60
Fix missing error and * on how heard other field [ci skip]
Mar 14, 2017
d6b8abf
Fix use of acorn global
pcardune Mar 14, 2017
6b43b1a
Merge pull request #13784 from code-dot-org/pcardune-interpreter-tests
pcardune Mar 14, 2017
9464e08
Merge pull request #13791 from code-dot-org/workshop-ca-survey-other-…
aoby Mar 14, 2017
b9516e1
Merge pull request #13795 from code-dot-org/levelbuilder
wjordan Mar 14, 2017
f83e2f4
Fix contact rollups bug with Petition Signer educators not getting ma…
Mar 14, 2017
2b62751
Merge branch 'staging' into pd-workshop-filters-api
Mar 14, 2017
767312a
Merge pull request #13790 from code-dot-org/ui-502-retry
wjordan Mar 14, 2017
fa13ca2
Step-mode UI test fixes
wjordan Mar 14, 2017
4166110
Add flexible order param and subject to workshop filters and remove d…
Mar 14, 2017
5a6310f
Merge pull request #13743 from code-dot-org/web-lab-videos
sfilman Mar 15, 2017
b6b4972
Fixes to signingIn UI test
wjordan Mar 15, 2017
3956560
Merge pull request #13797 from code-dot-org/step-mode-ui-test
wjordan Mar 15, 2017
d988193
Merge pull request #13798 from code-dot-org/signin-ui-fix
wjordan Mar 15, 2017
3a7ef64
staging content changes (-will)
deploy-code-org Mar 15, 2017
e8e0d59
Merge pull request #13799 from code-dot-org/staging
wjordan Mar 15, 2017
c244973
Merge pull request #13789 from code-dot-org/cancel_enrollment_navigation
mehalshah Mar 15, 2017
30f7954
Revert "Fixes to signingIn UI test"
wjordan Mar 15, 2017
cfd3319
Merge pull request #13801 from code-dot-org/revert-13798-signin-ui-fix
wjordan Mar 15, 2017
0473635
Merge pull request #13802 from code-dot-org/staging
wjordan Mar 15, 2017
407e582
Merge pull request #13796 from code-dot-org/contact_rollup_teacher_fix
Mar 15, 2017
ecbeac7
Reorder code so @user defined.
ashercodeorg Mar 15, 2017
865505f
Merge branch 'staging' into pd-workshop-filters-api
Mar 15, 2017
51017aa
Revert "Remove reference to and need for CDO.hip_chat_log_room."
ashercodeorg Mar 15, 2017
cc101fa
Merge pull request #13805 from code-dot-org/revert-13758-removeCdoHip…
ashercodeorg Mar 15, 2017
eac0c2c
Add test for student_register error.
ashercodeorg Mar 15, 2017
8da0fd6
Adjust cron times for DST.
ashercodeorg Mar 15, 2017
2159afd
Merge pull request #13804 from code-dot-org/staging
breville Mar 15, 2017
4e10b3a
staging content changes (-Brendan)
deploy-code-org Mar 15, 2017
f5baea1
Merge pull request #13806 from code-dot-org/fixDstCrons
ashercodeorg Mar 15, 2017
0ca72d6
Updated cookbook versions
deploy-code-org Mar 15, 2017
5d768d1
add location_name attribute to workshop download serializer
Mar 15, 2017
a607b7e
Merge pull request #13663 from code-dot-org/pd-workshop-filters-api
aoby Mar 15, 2017
f3f13d2
Merge pull request #13808 from code-dot-org/levelbuilder
breville Mar 15, 2017
78fa65b
Add pd-workshop filter UI
Mar 8, 2017
56b349d
Improve workshop filter UI:
Mar 12, 2017
4dd5571
Create ServerSortWorkshopTable that handles sorting, and use in place…
Mar 15, 2017
a3fcb9b
PR feedback
Mar 15, 2017
158c9d9
Merge pull request #13674 from code-dot-org/pd-workshop-filters-ui
aoby Mar 15, 2017
111c337
Merge pull request #13803 from code-dot-org/fixFollowers
ashercodeorg Mar 15, 2017
4ce6619
staging content changes (-Brendan)
deploy-code-org Mar 15, 2017
3eea74c
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
deploy-code-org Mar 15, 2017
768ecbc
Merge pull request #13809 from code-dot-org/staging
breville Mar 15, 2017
04682a6
Move Pardot code to library, update field names
Mar 15, 2017
ea07789
Merge pull request #13810 from code-dot-org/pardot_changes
Mar 15, 2017
00d5e8a
Fix bug introduced by renaming a React prop but not changing the call…
Mar 15, 2017
fd5aa4d
Merge pull request #13811 from code-dot-org/pd-workshop-ui-fix
aoby Mar 15, 2017
86b7d1d
Merge pull request #13812 from code-dot-org/staging
breville Mar 15, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ Style/WordArray:
# BEGIN BLACKLIST: Below are rules we don't plan to enable in the forseeable
# future. Rules we plan to fix (but are currently failing) belong in
# .rubocop_todo.yml.
Metrics/BlockLength:
Enabled: false

Metrics/AbcSize:
Enabled: false
Expand Down
8 changes: 0 additions & 8 deletions apps/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,6 @@ testsContext.keys().forEach(testsContext);
src: ['*.js'],
dest: 'build/package/js/fileupload/',
},
{
expand: true,
cwd: 'lib/jsinterpreter',
src: ['*.js'],
dest: 'build/package/js/jsinterpreter/'
}
]
}
};
Expand Down Expand Up @@ -562,8 +556,6 @@ testsContext.keys().forEach(testsContext);
config.uglify = {
lib: {
files: _.fromPairs([
'jsinterpreter/interpreter.js',
'jsinterpreter/acorn.js',
'p5play/p5.play.js',
'p5play/p5.js'
].map(function (src) {
Expand Down
1,760 changes: 0 additions & 1,760 deletions apps/lib/jsinterpreter/acorn.js

This file was deleted.