Refactored out more for feature flags

Refactored more for feature flags

cms/envs/acceptance.py

@@ -8,6 +8,7 @@ so that we can run the lettuce acceptance tests.
 # pylint: disable=W0401, W0614
 
 from .test import *
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
 # You need to start the server in debug mode,
 # otherwise the browser will not render the pages correctly
@@ -82,6 +83,14 @@ MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True
 USE_I18N = True
 
 MITX_FEATURES['USE_SAUCE'] = False
+MITX_FEATURES['SAUCE_USERNAME'] = '<USERNAME>'
+MITX_FEATURES['SAUCE_ACCESS_ID'] = '<ACCESS_ID>'
+MITX_FEATURES['SAUCE_BROWSER'] = DesiredCapabilities.CHROME
+MITX_FEATURES['SAUCE_PLATFORM'] = 'Linux'
+MITX_FEATURES['SAUCE_VERSION'] = ''
+MITX_FEATURES['SAUCE_BUILD'] = 'Feature Test'
+MITX_FEATURES['SAUCE_TAGS'] = ''
+
 
 # Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
 INSTALLED_APPS += ('lettuce.django',)

common/djangoapps/terrain/browser.py

@@ -50,13 +50,15 @@ try:
 except ImportError:
     import simplejson as json
 
-config = {"username": "<USERNAME>",
-"access-key": "<ACCESS_ID>"}
-desired_capabilities =  DesiredCapabilities.CHROME
-desired_capabilities['platform'] = "Linux"
-desired_capabilities['version'] = ""
-desired_capabilities['name'] = "CMS Lettuce Test"
-desired_capabilities['build'] = "Branch Test"
+config = {"username": settings.MITX_FEATURES.get('SAUCE_USERNAME'),
+"access-key": settings.MITX_FEATURES.get('SAUCE_ACCESS_ID')}
+
+desired_capabilities =  settings.MITX_FEATURES.get('SAUCE_BROWSER', DesiredCapabilities.CHROME)
+desired_capabilities['platform'] = settings.MITX_FEATURES.get('SAUCE_PLATFORM', 'Linux')
+desired_capabilities['version'] = settings.MITX_FEATURES.get('SAUCE_VERSION', '')
+desired_capabilities['name'] = "Lettuce Test"
+desired_capabilities['build'] = settings.MITX_FEATURES.get('SAUCE_BUILD', 'edX Plaform')
+desired_capabilities['tags'] = settings.MITX_FEATURES.get('SAUCE_TAGS', '')
 desired_capabilities['video-upload-on-pass'] = False
 desired_capabilities['sauce-advisor'] = False
 desired_capabilities['record-screenshots'] = False

lms/envs/acceptance.py

@@ -9,6 +9,8 @@ so that we can run the lettuce acceptance tests.
 
 from .test import *
 
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+
 # You need to start the server in debug mode,
 # otherwise the browser will not render the pages correctly
 DEBUG = True
@@ -91,6 +93,14 @@ MITX_FEATURES['ENABLE_FEEDBACK_SUBMISSION'] = True
 FEEDBACK_SUBMISSION_EMAIL = 'dummy@example.com'
 
 MITX_FEATURES['USE_SAUCE'] = False
+MITX_FEATURES['SAUCE_USERNAME'] = '<USERNAME>'
+MITX_FEATURES['SAUCE_ACCESS_ID'] = '<ACCESS_ID>'
+MITX_FEATURES['SAUCE_BROWSER'] = DesiredCapabilities.CHROME
+MITX_FEATURES['SAUCE_PLATFORM'] = 'Linux'
+MITX_FEATURES['SAUCE_VERSION'] = ''
+MITX_FEATURES['SAUCE_BUILD'] = 'edX Platform'
+MITX_FEATURES['SAUCE_TAGS'] = ''
+
 
 # Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
 INSTALLED_APPS += ('lettuce.django',)