address review comments

oppia · seanlip · Jul 6, 2019 · Jun 19, 2019 · Jun 21, 2019 · Jun 21, 2019
commit f27d23b495dd6ec6954b3518704ce47976921bca
diff --git a/app.yaml b/app.yaml
@@ -1,7 +1,11 @@
+# THIS FILE IS AUTOGENERATED, DO NOT MODIFY
 runtime: python27
 api_version: 1
 threadsafe: false
 instance_class: F2
+# The "version" line is added here so that MR jobs can run locally (see issue
+# #6534 on oppia/oppia).
+
 
 builtins:
 - appstats: on

diff --git a/assets/constants.js b/assets/constants.js
@@ -587,5 +587,5 @@ var constants = {
 
   "ALLOW_YAML_FILE_UPLOAD": false,
 
-  "DEV_MODE": true
+  "DEV_MODE": false
 };
diff --git a/core/templates/dev/head/pages/get-started-page/get-started-page.mainpage.html b/core/templates/dev/head/pages/get-started-page/get-started-page.mainpage.html
@@ -7,7 +7,7 @@
     <base-content>
       <content>
         <div class="oppia-static-header">
-          <h1 translate="I18N_GET_STARTED_PAGE_HEADING"></h1>
+          <h1 translate="I18N_GET_STARTED_PAGE_HEADING" class="protractor-test-get-started-page"></h1>
         </div>
         <background-banner></background-banner>
         <div class="oppia-page-card oppia-static-content oppia-static-content-below-banner">

diff --git a/core/templates/dev/head/pages/splash-page/splash-page.mainpage.html b/core/templates/dev/head/pages/splash-page/splash-page.mainpage.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <content>
-        <splash-page></splash-page>
+        <splash-page class="protractor-test-splash-page"></splash-page>
       </content>
     </base-content>
 

diff --git a/core/templates/dev/head/pages/splash-page/splash_at0.html b/core/templates/dev/head/pages/splash-page/splash_at0.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <content>
-        <div ng-controller="Splash">
+        <div ng-controller="Splash" class="protractor-test-splash-page">
           <div class="oppia-splash-section-one text-center">
             <h1 class="oppia-splash-h1" style="max-width: 800px; font-size: 2.3em; line-height: 1.5em; padding-bottom: 0.5em;">Lesson plans aren't just for the schoolday</h1>
 

diff --git a/core/templates/dev/head/pages/splash-page/splash_at1.html b/core/templates/dev/head/pages/splash-page/splash_at1.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <content>
-        <div ng-controller="Splash">
+        <div ng-controller="Splash" class="protractor-test-splash-page">
           <div class="oppia-splash-section-one text-center">
             <h1 class="oppia-splash-h1" style="max-width: 800px; font-size: 2.3em; line-height: 1.5em; padding-bottom: 0.5em;">Tired of the same lesson plans?</h1>
 

diff --git a/core/templates/dev/head/pages/teach-page/teach-page.mainpage.html b/core/templates/dev/head/pages/teach-page/teach-page.mainpage.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <navbar-breadcrumb>
-        <ul class="nav navbar-nav oppia-navbar-breadcrumb">
+        <ul class="nav navbar-nav oppia-navbar-breadcrumb protractor-test-teach-page">
           <li>
             <span class="oppia-navbar-breadcrumb-separator"></span>
             Teach with Oppia

@@ -96,22 +96,27 @@ describe('Oppia static pages tour', function() {
   it('visits the Get started page', function() {
     browser.get('/get_started');
     waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-get-started-page'))).toBe(true);
   });
 
   it('visits the Teach page', function() {
     browser.get('/teach');
     waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-teach-page'))).toBe(true);
   });
 
   it('visits the Splash pages', function() {
     browser.get('/splash');
     waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-splash-page'))).toBe(true);
 
     browser.get('/splash?c=at0');
     waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-splash-page'))).toBe(true);
 
     browser.get('/splash?c=at1');
     waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-splash-page'))).toBe(true);
   });
 
   afterEach(function() {

diff --git a/package-lock.json b/package-lock.json
@@ -105,6 +105,8 @@
 # hash).
 # This is because these files don't need cache invalidation, are referenced
 # from third party files or should not be moved to the build directory.
+# Statically served pages from app.yaml should be here to since they don't
+# need cache invalidation.
 FILEPATHS_NOT_TO_RENAME = (
     '*.py',
     'third_party/generated/fonts/*',
@@ -127,6 +129,25 @@
 HASH_BLOCK_SIZE = 2**20
 
 
+def generate_app_yaml():
+    """Generate app.yaml from app_dev.yaml."""
+    dev_file_prefix = 'core/templates/dev/head'
+    prod_file_prefix = 'build/templates/head'
+    content = '# THIS FILE IS AUTOGENERATED, DO NOT MODIFY\n'
+    with open('app_dev.yaml', 'r') as yaml_file:
+        content += yaml_file.read()
+    for file_path in FILEPATHS_NOT_TO_RENAME:
+        if '/dist/' in file_path:
+            content = content.replace(
+                dev_file_prefix + file_path[1:],
+                prod_file_prefix + file_path[1:])
+    content = content.replace('version: default', '')
+    if os.path.isfile('app.yaml'):
+        os.remove('app.yaml')
+    with open('app.yaml', 'w+') as prod_yaml_file:
+        prod_yaml_file.write(content)
+
+
 def require_compiled_js_dir_to_be_valid():
     """Checks if COMPILED_JS_DIR matches the output directory used in
     TSCONFIG_FILEPATH.
@@ -1307,6 +1328,7 @@ def build():
     if options.prod_mode:
         build_using_webpack()
         minify_third_party_libs(THIRD_PARTY_GENERATED_DEV_DIR)
+        generate_app_yaml()
         if not options.minify_third_party_libs_only:
             generate_build_directory()
 

@@ -89,12 +89,12 @@ if [[ "$FORCE_PROD_MODE" == "True" ]]; then
   constants_env_variable="\"DEV_MODE\": false"
   sed -i.bak -e s/"\"DEV_MODE\": .*"/"$constants_env_variable"/ assets/constants.js
   $PYTHON_CMD scripts/build.py --prod_env --enable_watcher
-  APP_YAML="app.yaml"
+  APP_YAML_FILEPATH="app.yaml"
 else
   constants_env_variable="\"DEV_MODE\": true"
   sed -i.bak -e s/"\"DEV_MODE\": .*"/"$constants_env_variable"/ assets/constants.js
   $PYTHON_CMD scripts/build.py --enable_watcher
-  APP_YAML="app_dev.yaml"
+  APP_YAML_FILEPATH="app_dev.yaml"
 fi
 
 # Delete the modified feconf.py file(-i.bak)
@@ -114,7 +114,7 @@ if ! [[ "$FORCE_PROD_MODE" == "True" ]]; then
   ($NODE_MODULE_DIR/webpack/bin/webpack.js --config webpack.dev.config.ts --watch)&
 fi
 echo Starting GAE development server
-(python $GOOGLE_APP_ENGINE_HOME/dev_appserver.py $CLEAR_DATASTORE_ARG $ENABLE_CONSOLE_ARG --admin_host 0.0.0.0 --admin_port 8000 --host 0.0.0.0 --port 8181 --skip_sdk_update_check true $APP_YAML)&
+(python $GOOGLE_APP_ENGINE_HOME/dev_appserver.py $CLEAR_DATASTORE_ARG $ENABLE_CONSOLE_ARG --admin_host 0.0.0.0 --admin_port 8000 --host 0.0.0.0 --port 8181 --skip_sdk_update_check true $APP_YAML_FILEPATH)&
 
 # Wait for the servers to come up.
 while ! nc -vz localhost 8181 >/dev/null 2>&1; do sleep 1; done