From 538ecf4852b3c1c0a71d38f17cd7f9a37ac9359a Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 22 Jan 2014 11:00:05 -0500 Subject: [PATCH] Enable microsite tests Move microsite test assets to common/test Rename helper method to not have test in the name Rename test css file --- .../test_microsite/css/test_microsite.css | 0 .../test_microsite/images/background-image.jpg | Bin .../test_microsite/images/header-logo.png | Bin .../images/login-and-register-banner.png | Bin .../templates/emails/activation_email.txt | 0 .../templates/emails/activation_email_subject.txt | 0 .../templates/emails/confirm_email_change.txt | 0 .../templates/emails/email_change.txt | 0 .../templates/emails/email_change_subject.txt | 0 .../emails/enroll_email_allowedmessage.txt | 0 .../emails/enroll_email_allowedsubject.txt | 0 .../emails/enroll_email_enrolledmessage.txt | 0 .../emails/enroll_email_enrolledsubject.txt | 0 .../emails/unenroll_email_allowedmessage.txt | 0 .../emails/unenroll_email_enrolledmessage.txt | 0 .../templates/emails/unenroll_email_subject.txt | 0 .../test_microsite/templates/footer.html | 0 .../test_microsite/templates/login-sidebar.html | 0 .../test_microsite/templates/register-sidebar.html | 0 .../templates/static_templates/about.html | 0 .../templates/static_templates/contact.html | 0 .../templates/static_templates/faq.html | 0 .../templates/static_templates/tos.html | 0 lms/djangoapps/courseware/tests/test_microsites.py | 10 +++++----- lms/envs/test.py | 2 +- 25 files changed, 6 insertions(+), 6 deletions(-) rename test_microsites/test_microsite/css/openedx.css => common/test/test_microsites/test_microsite/css/test_microsite.css (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/images/background-image.jpg (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/images/header-logo.png (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/images/login-and-register-banner.png (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/activation_email.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/activation_email_subject.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/confirm_email_change.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/email_change.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/email_change_subject.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/enroll_email_allowedmessage.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/enroll_email_allowedsubject.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/enroll_email_enrolledmessage.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/enroll_email_enrolledsubject.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/unenroll_email_allowedmessage.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/unenroll_email_enrolledmessage.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/emails/unenroll_email_subject.txt (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/footer.html (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/login-sidebar.html (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/register-sidebar.html (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/static_templates/about.html (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/static_templates/contact.html (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/static_templates/faq.html (100%) rename {test_microsites => common/test/test_microsites}/test_microsite/templates/static_templates/tos.html (100%) diff --git a/test_microsites/test_microsite/css/openedx.css b/common/test/test_microsites/test_microsite/css/test_microsite.css similarity index 100% rename from test_microsites/test_microsite/css/openedx.css rename to common/test/test_microsites/test_microsite/css/test_microsite.css diff --git a/test_microsites/test_microsite/images/background-image.jpg b/common/test/test_microsites/test_microsite/images/background-image.jpg similarity index 100% rename from test_microsites/test_microsite/images/background-image.jpg rename to common/test/test_microsites/test_microsite/images/background-image.jpg diff --git a/test_microsites/test_microsite/images/header-logo.png b/common/test/test_microsites/test_microsite/images/header-logo.png similarity index 100% rename from test_microsites/test_microsite/images/header-logo.png rename to common/test/test_microsites/test_microsite/images/header-logo.png diff --git a/test_microsites/test_microsite/images/login-and-register-banner.png b/common/test/test_microsites/test_microsite/images/login-and-register-banner.png similarity index 100% rename from test_microsites/test_microsite/images/login-and-register-banner.png rename to common/test/test_microsites/test_microsite/images/login-and-register-banner.png diff --git a/test_microsites/test_microsite/templates/emails/activation_email.txt b/common/test/test_microsites/test_microsite/templates/emails/activation_email.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/activation_email.txt rename to common/test/test_microsites/test_microsite/templates/emails/activation_email.txt diff --git a/test_microsites/test_microsite/templates/emails/activation_email_subject.txt b/common/test/test_microsites/test_microsite/templates/emails/activation_email_subject.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/activation_email_subject.txt rename to common/test/test_microsites/test_microsite/templates/emails/activation_email_subject.txt diff --git a/test_microsites/test_microsite/templates/emails/confirm_email_change.txt b/common/test/test_microsites/test_microsite/templates/emails/confirm_email_change.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/confirm_email_change.txt rename to common/test/test_microsites/test_microsite/templates/emails/confirm_email_change.txt diff --git a/test_microsites/test_microsite/templates/emails/email_change.txt b/common/test/test_microsites/test_microsite/templates/emails/email_change.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/email_change.txt rename to common/test/test_microsites/test_microsite/templates/emails/email_change.txt diff --git a/test_microsites/test_microsite/templates/emails/email_change_subject.txt b/common/test/test_microsites/test_microsite/templates/emails/email_change_subject.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/email_change_subject.txt rename to common/test/test_microsites/test_microsite/templates/emails/email_change_subject.txt diff --git a/test_microsites/test_microsite/templates/emails/enroll_email_allowedmessage.txt b/common/test/test_microsites/test_microsite/templates/emails/enroll_email_allowedmessage.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/enroll_email_allowedmessage.txt rename to common/test/test_microsites/test_microsite/templates/emails/enroll_email_allowedmessage.txt diff --git a/test_microsites/test_microsite/templates/emails/enroll_email_allowedsubject.txt b/common/test/test_microsites/test_microsite/templates/emails/enroll_email_allowedsubject.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/enroll_email_allowedsubject.txt rename to common/test/test_microsites/test_microsite/templates/emails/enroll_email_allowedsubject.txt diff --git a/test_microsites/test_microsite/templates/emails/enroll_email_enrolledmessage.txt b/common/test/test_microsites/test_microsite/templates/emails/enroll_email_enrolledmessage.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/enroll_email_enrolledmessage.txt rename to common/test/test_microsites/test_microsite/templates/emails/enroll_email_enrolledmessage.txt diff --git a/test_microsites/test_microsite/templates/emails/enroll_email_enrolledsubject.txt b/common/test/test_microsites/test_microsite/templates/emails/enroll_email_enrolledsubject.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/enroll_email_enrolledsubject.txt rename to common/test/test_microsites/test_microsite/templates/emails/enroll_email_enrolledsubject.txt diff --git a/test_microsites/test_microsite/templates/emails/unenroll_email_allowedmessage.txt b/common/test/test_microsites/test_microsite/templates/emails/unenroll_email_allowedmessage.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/unenroll_email_allowedmessage.txt rename to common/test/test_microsites/test_microsite/templates/emails/unenroll_email_allowedmessage.txt diff --git a/test_microsites/test_microsite/templates/emails/unenroll_email_enrolledmessage.txt b/common/test/test_microsites/test_microsite/templates/emails/unenroll_email_enrolledmessage.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/unenroll_email_enrolledmessage.txt rename to common/test/test_microsites/test_microsite/templates/emails/unenroll_email_enrolledmessage.txt diff --git a/test_microsites/test_microsite/templates/emails/unenroll_email_subject.txt b/common/test/test_microsites/test_microsite/templates/emails/unenroll_email_subject.txt similarity index 100% rename from test_microsites/test_microsite/templates/emails/unenroll_email_subject.txt rename to common/test/test_microsites/test_microsite/templates/emails/unenroll_email_subject.txt diff --git a/test_microsites/test_microsite/templates/footer.html b/common/test/test_microsites/test_microsite/templates/footer.html similarity index 100% rename from test_microsites/test_microsite/templates/footer.html rename to common/test/test_microsites/test_microsite/templates/footer.html diff --git a/test_microsites/test_microsite/templates/login-sidebar.html b/common/test/test_microsites/test_microsite/templates/login-sidebar.html similarity index 100% rename from test_microsites/test_microsite/templates/login-sidebar.html rename to common/test/test_microsites/test_microsite/templates/login-sidebar.html diff --git a/test_microsites/test_microsite/templates/register-sidebar.html b/common/test/test_microsites/test_microsite/templates/register-sidebar.html similarity index 100% rename from test_microsites/test_microsite/templates/register-sidebar.html rename to common/test/test_microsites/test_microsite/templates/register-sidebar.html diff --git a/test_microsites/test_microsite/templates/static_templates/about.html b/common/test/test_microsites/test_microsite/templates/static_templates/about.html similarity index 100% rename from test_microsites/test_microsite/templates/static_templates/about.html rename to common/test/test_microsites/test_microsite/templates/static_templates/about.html diff --git a/test_microsites/test_microsite/templates/static_templates/contact.html b/common/test/test_microsites/test_microsite/templates/static_templates/contact.html similarity index 100% rename from test_microsites/test_microsite/templates/static_templates/contact.html rename to common/test/test_microsites/test_microsite/templates/static_templates/contact.html diff --git a/test_microsites/test_microsite/templates/static_templates/faq.html b/common/test/test_microsites/test_microsite/templates/static_templates/faq.html similarity index 100% rename from test_microsites/test_microsite/templates/static_templates/faq.html rename to common/test/test_microsites/test_microsite/templates/static_templates/faq.html diff --git a/test_microsites/test_microsite/templates/static_templates/tos.html b/common/test/test_microsites/test_microsite/templates/static_templates/tos.html similarity index 100% rename from test_microsites/test_microsite/templates/static_templates/tos.html rename to common/test/test_microsites/test_microsite/templates/static_templates/tos.html diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py index 0daffb611c..e9cd776376 100644 --- a/lms/djangoapps/courseware/tests/test_microsites.py +++ b/lms/djangoapps/courseware/tests/test_microsites.py @@ -45,7 +45,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): self.course_outside_microsite = CourseFactory.create(display_name='Robot_Course_Outside_Microsite', org='FooX') - def create_test_accounts(self): + def create_student_accounts(self): """ Build out the test accounts we'll use in these tests """ @@ -56,7 +56,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): self.create_account(username, email, password) self.activate_user(email) - @skip # skipping - runs fine on localdev, not jenkins environment + def test_microsite_anonymous_homepage_content(self): """ Verify that the homepage, when accessed via a Microsite domain, returns @@ -89,7 +89,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): # assert that the edX partners tag line is not in the HTML self.assertNotContains(resp, 'Explore free courses from') - @skip # skipping - runs fine on localdev, not jenkins environment + def test_not_microsite_anonymous_homepage_content(self): """ Make sure we see the right content on the homepage if we are not in a microsite @@ -120,14 +120,14 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): # assert that the edX partners tag line is not in the HTML self.assertContains(resp, 'Explore free courses from') - @skip # skipping - runs fine on localdev, not jenkins environment + def test_microsite_course_enrollment(self): """ Enroll user in a course scoped in a Microsite and one course outside of a Microsite and make sure that they are only visible in the right Dashboards """ - self.create_test_accounts() + self.create_student_accounts() email, password = self.STUDENT_INFO[0] self.login(email, password) diff --git a/lms/envs/test.py b/lms/envs/test.py index 5e23b20607..a3b490c0b4 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -304,7 +304,7 @@ if len(MICROSITE_CONFIGURATION.keys()) > 0: MICROSITE_CONFIGURATION, SUBDOMAIN_BRANDING, VIRTUAL_UNIVERSITIES, - microsites_root=ENV_ROOT / 'edx-platform' / 'test_microsites' + microsites_root=COMMON_ROOT / "test" / 'test_microsites' ) ######### LinkedIn ########