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.

Sign up for GitHub

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

Serve static pages from app.yaml #6974

Merged
merged 22 commits into from
Jul 6, 2019
Merged

Serve static pages from app.yaml #6974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0bc53bb
create render template method
jameesjohn Jun 19, 2019
df266a2
address review comments
jameesjohn Jun 21, 2019
8b63d34
Merge branch 'develop' of https://github.com/oppia/oppia into static-…
jameesjohn Jun 21, 2019
9106197
address review comments
jameesjohn Jun 21, 2019
6d2cdb9
fix error due to merge
jameesjohn Jun 21, 2019
77fc41d
address review comments
jameesjohn Jun 22, 2019
e3f24b7
serve statics files from app.yaml
jameesjohn Jun 23, 2019
fff201a
address review comments
jameesjohn Jun 24, 2019
9baa459
more on review comments and test issue
jameesjohn Jun 24, 2019
3458a6b
Merge branch 'develop' of https://github.com/oppia/oppia into static-…
jameesjohn Jun 29, 2019
6df30d8
add hases to files in app.yaml
jameesjohn Jun 29, 2019
a209b4e
Merge branch 'develop' of https://github.com/oppia/oppia into static-…
jameesjohn Jul 2, 2019
7ccbf19
create dev app.yaml and prod app.yaml as well as write tests for the …
jameesjohn Jul 3, 2019
04bd338
address review comments and revert package-lock.json
jameesjohn Jul 3, 2019
f27d23b
address review comments
jameesjohn Jul 4, 2019
c6617b5
revert change in constants
jameesjohn Jul 4, 2019
81922b9
remove app.yaml
jameesjohn Jul 4, 2019
9104bca
work on failing e2e tests
jameesjohn Jul 5, 2019
abddd81
fix lint issues
jameesjohn Jul 5, 2019
33c6f79
revert package-lock.json
jameesjohn Jul 5, 2019
d99be7c
Merge branch 'develop' of https://github.com/oppia/oppia into static-…
jameesjohn Jul 6, 2019
bd7eca5
remove other variants of splash page
jameesjohn Jul 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more on review comments and test issue
  • Loading branch information
@jameesjohn
jameesjohn committed Jun 24, 2019
commit 9baa4596d082df55d38138c06f870ed396e762c2
10 changes: 0 additions & 10 deletions app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ handlers:
static_files: core/templates/dev/head/dist/get-started-page.mainpage.html
upload: core/templates/dev/head/dist/get-started-page.mainpage.html
http_headers:
Cache-Control: 'no-cache, must-revalidate'
Expires: 'Mon, 01 Jan 1990 00:00:00 GMT'
Pragma: no-cache
Strict-Transport-Security: 'max-age=31536000; includeSubDomains'
X-Content-Type-Options: nosniff
Expand All @@ -156,8 +154,6 @@ handlers:
static_files: core/templates/dev/head/dist/splash-page.mainpage.html
upload: core/templates/dev/head/dist/splash-page.mainpage.html
http_headers:
Cache-Control: 'no-cache, must-revalidate'
Expires: 'Mon, 01 Jan 1990 00:00:00 GMT'
Pragma: no-cache
Strict-Transport-Security: 'max-age=31536000; includeSubDomains'
X-Content-Type-Options: nosniff
Expand All @@ -169,8 +165,6 @@ handlers:
static_files: core/templates/dev/head/dist/splash_at0.html
upload: core/templates/dev/head/dist/splash_at0.html
http_headers:
Cache-Control: 'no-cache, must-revalidate'
Expires: 'Mon, 01 Jan 1990 00:00:00 GMT'
Pragma: no-cache
Strict-Transport-Security: 'max-age=31536000; includeSubDomains'
X-Content-Type-Options: nosniff
Expand All @@ -182,8 +176,6 @@ handlers:
static_files: core/templates/dev/head/dist/splash_at1.html
upload: core/templates/dev/head/dist/splash_at1.html
http_headers:
Cache-Control: 'no-cache, must-revalidate'
Expires: 'Mon, 01 Jan 1990 00:00:00 GMT'
Pragma: no-cache
Strict-Transport-Security: 'max-age=31536000; includeSubDomains'
X-Content-Type-Options: nosniff
Expand All @@ -195,8 +187,6 @@ handlers:
static_files: core/templates/dev/head/dist/teach-page.mainpage.html
upload: core/templates/dev/head/dist/teach-page.mainpage.html
http_headers:
Cache-Control: 'no-cache, must-revalidate'
Expires: 'Mon, 01 Jan 1990 00:00:00 GMT'
Pragma: no-cache
Strict-Transport-Security: 'max-age=31536000; includeSubDomains'
X-Content-Type-Options: nosniff
Expand Down
4 changes: 2 additions & 2 deletions core/controllers/base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,9 @@ def mock_get_current_time(unused_cls):
def test_redirect_oppia_test_server(self):
# The old demo server redirects to the new demo server.
self.get_html_response(
'https://oppiaserver.appspot.com/splash', expected_status_int=301)
'https://oppiaserver.appspot.com/about', expected_status_int=301)
self.get_html_response(
'https://oppiatestserver.appspot.com/splash')
'https://oppiatestserver.appspot.com/about')


class EscapingTests(test_utils.GenericTestBase):
Expand Down
13 changes: 0 additions & 13 deletions core/controllers/pages_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,6 @@ def test_about_page(self):
response.mustcontain(
'<about-page></about-page>')

def test_splash_page_with_valid_c_value(self):
response = self.get_html_response('/splash', params={'c': 'at0'})
self.assertIn(
'Create fun interactive quizzes that students can do at home.',
response.body)

def test_splash_page_with_invalid_c_value_redirects(self):
response = self.get_html_response(
'/splash?data=value', params={'c': 'invalid'},
expected_status_int=302)
self.assertTrue(
response.headers['Location'].endswith('/splash?data=value'))

def test_maintenance_page(self):
fake_urls = []
fake_urls.append(
Expand Down