Commit Graph

19654 Commits

Author SHA1 Message Date
JonahStanley
bb7cbf4d62 If sauce is not enabled, allow full range of ports
Forgot an import
2013-08-21 16:05:03 -04:00
JonahStanley
4c3dcda7e8 Hack to get around many types of string encodings
Changed the port listing

Changing to better readability
2013-08-21 16:05:03 -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
027cbfd09a Added logic to test_acceptance.sh so that the proper tests will be skipped for each browser
This logic also covers if a lettuce_browser is specified

Removing browser matrix from readme
2013-08-21 16:05:02 -04:00
JonahStanley
d422cb9206 Fixed desired_capabilities issues
Also, now lettuce browser can be specified by jenkins
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
JonahStanley
f4c19919cd Beginnings of a feature flag
Conflicts:
	common/djangoapps/terrain/browser.py

Changed way feature flag was checked

Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:00 -04:00
JonahStanley
876651009e Logging out no longer uses cookies.
Removed other cookie reference
2013-08-21 16:05:00 -04:00
JonahStanley
eb7fe7c927 Added browser matrix (might not display yet)
Added build information.  Status image will now display properly
2013-08-21 16:05:00 -04:00
Jay Zoldak
81151ab67a Prototype for running acceptance tests via Sauce Labs Connector
Added in more desired capabilities and fixed the browser creation

Sauce Labs is now updated if the test suite passes or fails
2013-08-21 16:05:00 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod
Allow grace periods of > 24 hours.
2013-08-21 13:00:15 -07:00
Diana Huang
bd4cc448af Clean up models, add some error handling 2013-08-21 15:55:30 -04:00
Jonah Stanley
0138c08288 Merge pull request #758 from edx/jonahstanley/fix-courseteam-test
Made the lambda statement more resistant to errors
2013-08-21 12:47:35 -07:00
Frances Botsford
c392349fb0 adjusted controls for v photos 2013-08-21 15:40:08 -04:00
Frances Botsford
abd678e464 initial step interaction for verification 2013-08-21 15:27:37 -04:00
John Jarvis
6ba85765e7 pep8 2013-08-21 15:15:13 -04:00
John Jarvis
ca24d2ab40 adding certificate info to the grade dump 2013-08-21 15:14:02 -04:00
JonahStanley
af028efd00 Made the lambda statement more resistant to errors
Made the statement better

pylint fix

Accidently left off parameter

Removed logout
2013-08-21 15:01:33 -04:00
Diana Huang
e2ae0b2970 Remove line_cost from OrderItem 2013-08-21 14:49:18 -04:00
Chris Dodge
21f4b05813 fix some gaps which would allow the temporary xml attributes 'parent_sequential_url' and 'index_in_children_list' to get persisted in the database, whereas they are meant to be only scoped during export/import 2013-08-21 14:46:38 -04:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload
WIP: Peter fogg/course image upload
2013-08-21 11:17:12 -07:00
Carlos Andrés Rocha
e01ea885e4 Merge pull request #762 from edx/jkarni/hotfix/tempfile-varname
Fix var name issue
2013-08-21 11:16:50 -07:00
chrisndodge
9dce9d1e23 Merge pull request #755 from edx/fix/cdodge/STUD-671
update the PDF textbook url paths as well as update wiki_slug when impor...
2013-08-21 10:54:51 -07:00
Diana Huang
26f1caaf57 Add jsinput_spec back in. 2013-08-21 13:54:22 -04:00
Jason Bau
ef4e8f7e13 move currency formatting into template 2013-08-21 10:31:26 -07:00
Jason Bau
f59e7edb8f minor changes to PaidCourseRegistrationTest.test_purchased_callback 2013-08-21 13:16:06 -04:00
Jason Bau
1c2d84077b 100% coverage on shoppingcart/models.py 2013-08-21 13:15:37 -04:00
Diana Huang
42f8b970fc Clean up views and models. 2013-08-21 13:14:23 -04:00
Diana Huang
76766cbcae Some pep8/pylint cleanup 2013-08-21 13:14:22 -04:00
Jason Bau
d38748b300 100% coverage on CyberSource.py 2013-08-21 13:14:22 -04:00
Jason Bau
3da149ad76 Start of tests for CyberSource processor 2013-08-21 13:14:22 -04:00
Jason Bau
3ecdb6711f change method sig of process_postpay_callback 2013-08-21 13:14:22 -04:00
Jason Bau
64c8a7444f add handling of CyberSource non-ACCEPT decisions 2013-08-21 13:14:22 -04:00
Jason Bau
efbb439cb5 Adding migration to store purchased mode in PaidCourseRegistration 2013-08-21 13:14:22 -04:00
Jason Bau
65f2814d73 make PaidCourseRegistration mode aware 2013-08-21 13:14:22 -04:00
Diana Huang
c5f353ec05 Major cleanup work on ShoppingCart models
* Make currency a property of the Order (for validation purposes)
* Remove null=True from Char fields
* Use InheritanceManager for subclassing OrderItem
* Change VerifiedCertificate to better handle some new use cases
* Cleaned out old migrations
* Tests!
2013-08-21 13:14:21 -04:00
Diana Huang
38ba856ddc Start building tests 2013-08-21 13:14:21 -04:00