Commit Graph

5986 Commits

Author SHA1 Message Date
Julian Arni
b6795b4e88 Add jquery-file-upload 2013-08-25 22:40:09 -04:00
Giulio Gratta
4e77098859 added course level feature flag for forum alpha sorting as well as tests 2013-08-23 12:59:13 -07:00
Peter Fogg
07d9106c09 Merge pull request #769 from edx/peter-fogg/studio-error-descriptor
Allow Studio to display error modules.
2013-08-23 11:51:57 -07:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests
Will/use mixed modulestore in tests
2013-08-23 08:38:09 -07:00
Diana Huang
569727e608 Pep8 fixes 2013-08-22 15:58:07 -04:00
Peter Fogg
2466a5f557 Allow Studio to display error modules. 2013-08-22 15:48:49 -04:00
Diana Huang
dee127360b Clean up models, add some error handling 2013-08-22 15:39:56 -04:00
Diana Huang
6c19f3a7ad Add jsinput_spec back in. 2013-08-22 15:39:56 -04:00
Jason Bau
6f70c9b9ce Adding migration to store purchased mode in PaidCourseRegistration 2013-08-22 15:39:55 -04:00
Jason Bau
5fbb12cb61 make PaidCourseRegistration mode aware 2013-08-22 15:39:55 -04:00
Jason Bau
5ae2289df0 about page changes, refactor processor reply handling 2013-08-22 15:39:55 -04:00
Jason Bau
3f9c52cd1c Move shopping cart from session into model/db 2013-08-22 15:39:54 -04:00
Jason Bau
988a7a1fba initial commit of shopping cart and cybersource integration 2013-08-22 15:39:54 -04:00
Vik Paruchuri
26a301f42e Merge pull request #504 from edx/feature/vik/oe-ui
Feature/vik/oe ui
2013-08-22 12:23:29 -07:00
Chris Dodge
46ce931d51 ErrorDescriptors do not have xml_attributes field 2013-08-22 14:50:45 -04:00
Vik Paruchuri
21e13e44af Pep8 and pylint fixes 2013-08-22 14:29:39 -04:00
Will Daly
736b3e0ecd Common djangoapps no longer access courseware; other cleanup 2013-08-22 14:08:35 -04:00
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static
Enable mongodb to be used as back-end for git-based authoring workflow
2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes
fix some gaps which would allow the temporary xml attributes 'parent_seq...
2013-08-22 11:00:55 -07:00
Vik Paruchuri
a6cc30d1fe Fix tests, address review feedback 2013-08-22 13:51:27 -04:00
Chris Dodge
7138aed2a9 add xlint tests in test_mongo.py 2013-08-22 13:30:52 -04:00
chrisndodge
2699ba65ba Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization
Fix/cdodge/incorrect html serialization
2013-08-22 08:58:56 -07:00
Chris Dodge
079470d439 add some more tests in common to increase coverage 2013-08-22 11:48:37 -04:00
Jonah Stanley
a7851a9850 Merge pull request #678 from edx/zoldak/acceptance-sauce
Zoldak/acceptance sauce
2013-08-22 07:32:43 -07:00
JonahStanley
d96595318a Stylistic changes
CMS tests should now run on IE

CMS tests will now run on Safari

Rebased wrong

Forgot to update the test_acceptance.sh

Changed way of string splitting
2013-08-22 10:08:35 -04:00
Chris Dodge
842556d284 add new test data with draft content 2013-08-22 08:57:10 -04:00
Anton Stupak
03111cb98e Remove onTouchBasedDevice function. 2013-08-22 08:45:44 +03:00
Anton Stupak
22b5decc95 Small fixes. 2013-08-22 08:45:43 +03:00
Anton Stupak
63c5ec5277 Add supporting failover from Youtube. 2013-08-22 08:45:43 +03:00
Chris Dodge
77a38afaeb add some draft courseware importing paths in common/* tests 2013-08-21 22:00:33 -04:00
Chris Dodge
0c1c3f11af loop in static import testing into common/* tests 2013-08-21 20:48:56 -04:00
Will Daly
078ad4b25e Added comment justifying ModuleStoreTestCase design. 2013-08-21 20:31:23 -04:00
Will Daly
8165a033b1 Pep8/pylint fixes
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
2013-08-21 19:42:59 -04:00
Will Daly
109d3c3d10 Refactored to remove test#XXX methods from ModuleStoreTestCase 2013-08-21 19:00:32 -04:00
Will Daly
151782acf0 LMS acceptance tests use mixed modulestore 2013-08-21 16:23:48 -04:00
JonahStanley
21f75ff250 Various stylistic and pylint fixes / changes
Version numbers have very different ranges for different browsers so not having a dictionary of those.

Fixed a whitespace issue

Fixed pylint/pep8 violations

Don't need django_url

Spacing issues

Changed how commenting works

Forgot one

Used wrong name

Changed around importing

Remove django_url

Fixed function orderingn

Made logic nicer for getting a new browser

Modifying tests to run in opera

Needed to increase time to account for slow sauce loading

Now safari LMS works

Forgot an assert statement

Skipping a few tests for opera
2013-08-21 16:05:52 -04:00
JonahStanley
22b3f2b161 Factored out Sauce related things to one file
LMS was arbitrarily chosen for now.

Fixed up pylint and pep8 errors

Fixed up pylint and pep8 errors

Changed naming to be better

Changed Sauce Info to obtaining a JSON string
2013-08-21 16:05:03 -04:00
JonahStanley
35e5f4cab5 Moved global things in browser.py to functions 2013-08-21 16:05:02 -04:00
JonahStanley
0b6e62984e Using requests instead of a HTTPConnect 2013-08-21 16:05:02 -04:00
JonahStanley
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
2013-08-21 16:05:02 -04:00
JonahStanley
ee23b9d161 Changed method of obtaining feature flags to environment variables
Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:02 -04:00
JonahStanley
9fb0529036 Sauce can only connect on certain ports 2013-08-21 16:05:02 -04:00
JonahStanley
3cf8083717 Upgraded selenium version for sauce 2013-08-21 16:05:01 -04:00
JonahStanley
2812b9cd5c Fixed how config was obtained
Added comment about the feature
2013-08-21 16:05:01 -04:00
JonahStanley
682d85c2f3 Changed feature to being one dictionary
Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:01 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
2013-08-21 16:05:01 -04:00
JonahStanley
97df5aa997 Added feature flag for device type. Needed for android tablets 2013-08-21 16:05:01 -04:00
JonahStanley
1d7284b7cd Refactored out more for feature flags
Refactored more for feature flags
2013-08-21 16:05:01 -04:00
JonahStanley
010fd5771d Pass/Fail status updated properly
Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:00 -04:00
JonahStanley
28d9bbaff2 Change build name generation
Browser Matrix Data only applies to latest build information
2013-08-21 16:05:00 -04:00