Merge pull request #10948 from edx/ziafazal/SOL-1375

ziafazal/SOL-1375: Create course to org link at the time of course creation

common/test/acceptance/tests/lms/test_lms_course_discovery.py

@@ -3,6 +3,7 @@ Test course discovery.
 """
 import datetime
 import json
+import uuid
 
 from bok_choy.web_app_test import WebAppTest
 from ..helpers import remove_file
@@ -34,29 +35,14 @@ class CourseDiscoveryTest(WebAppTest):
         super(CourseDiscoveryTest, self).setUp()
         self.page = CourseDiscoveryPage(self.browser)
 
-        for i in range(10):
-            org = self.unique_id
-            number = unicode(i)
+        for i in range(12):
+            org = 'test_org'
+            number = "{}{}".format(str(i), str(uuid.uuid4().get_hex().upper()[0:6]))
             run = "test_run"
-            name = "test course"
+            name = "test course" if i < 10 else "grass is always greener"
             settings = {'enrollment_start': datetime.datetime(1970, 1, 1).isoformat()}
             CourseFixture(org, number, run, name, settings=settings).install()
 
-        for i in range(2):
-            org = self.unique_id
-            number = unicode(i)
-            run = "test_run"
-            name = "grass is always greener"
-            CourseFixture(
-                org,
-                number,
-                run,
-                name,
-                settings={
-                    'enrollment_start': datetime.datetime(1970, 1, 1).isoformat()
-                }
-            ).install()
-
     def _auto_auth(self, username, email, staff):
         """
         Logout and login with given credentials.

common/test/acceptance/tests/studio/test_studio_course_create.py

@@ -0,0 +1,140 @@
+"""
+Acceptance tests for course creation.
+"""
+import uuid
+from bok_choy.web_app_test import WebAppTest
+
+from ...pages.studio.auto_auth import AutoAuthPage
+from ...pages.studio.index import DashboardPage
+from ...pages.studio.overview import CourseOutlinePage
+
+
+class CreateCourseTest(WebAppTest):
+    """
+    Test that we can create a new course the studio home page.
+    """
+
+    def setUp(self):
+        """
+        Load the helper for the home page (dashboard page)
+        """
+        super(CreateCourseTest, self).setUp()
+
+        self.auth_page = AutoAuthPage(self.browser, staff=True)
+        self.dashboard_page = DashboardPage(self.browser)
+        self.course_name = "New Course Name"
+        self.course_org = "orgX"
+        self.course_number = str(uuid.uuid4().get_hex().upper()[0:6])
+        self.course_run = "2015_T2"
+
+    def test_create_course_with_non_existing_org(self):
+        """
+        Scenario: Ensure that the course creation with non existing org display proper error message.
+        Given I have filled course creation form with a non existing and all required fields
+        When I click 'Create' button
+        Form validation should pass
+        Then I see the error message explaining reason for failure to create course
+        """
+
+        self.auth_page.visit()
+        self.dashboard_page.visit()
+        self.assertFalse(self.dashboard_page.has_course(
+            org='testOrg', number=self.course_number, run=self.course_run
+        ))
+        self.assertTrue(self.dashboard_page.new_course_button.present)
+
+        self.dashboard_page.click_new_course_button()
+        self.assertTrue(self.dashboard_page.is_new_course_form_visible())
+        self.dashboard_page.fill_new_course_form(
+            self.course_name, 'testOrg', self.course_number, self.course_run
+        )
+        self.assertTrue(self.dashboard_page.is_new_course_form_valid())
+        self.dashboard_page.submit_new_course_form()
+        self.assertTrue(self.dashboard_page.error_notification.present)
+        self.assertIn(
+            u'Organization you selected does not exist in the system', self.dashboard_page.error_notification_message
+        )
+
+    def test_create_course_with_existing_org(self):
+        """
+        Scenario: Ensure that the course creation with an existing org should be successful.
+        Given I have filled course creation form with an existing org and all required fields
+        When I click 'Create' button
+        Form validation should pass
+        Then I see the course listing page with newly created course
+        """
+
+        self.auth_page.visit()
+        self.dashboard_page.visit()
+        self.assertFalse(self.dashboard_page.has_course(
+            org=self.course_org, number=self.course_number, run=self.course_run
+        ))
+        self.assertTrue(self.dashboard_page.new_course_button.present)
+
+        self.dashboard_page.click_new_course_button()
+        self.assertTrue(self.dashboard_page.is_new_course_form_visible())
+        self.dashboard_page.fill_new_course_form(
+            self.course_name, self.course_org, self.course_number, self.course_run
+        )
+        self.assertTrue(self.dashboard_page.is_new_course_form_valid())
+        self.dashboard_page.submit_new_course_form()
+
+        # Successful creation of course takes user to course outline page
+        course_outline_page = CourseOutlinePage(
+            self.browser,
+            self.course_org,
+            self.course_number,
+            self.course_run
+        )
+        course_outline_page.visit()
+        course_outline_page.wait_for_page()
+
+        # Go back to dashboard and verify newly created course exists there
+        self.dashboard_page.visit()
+        self.assertTrue(self.dashboard_page.has_course(
+            org=self.course_org, number=self.course_number, run=self.course_run
+        ))
+
+    def test_create_course_with_existing_org_via_autocomplete(self):
+        """
+        Scenario: Ensure that the course creation with an existing org should be successful.
+        Given I have filled course creation form with an existing org and all required fields
+        And I selected `Course Organization` input via autocomplete
+        When I click 'Create' button
+        Form validation should pass
+        Then I see the course listing page with newly created course
+        """
+
+        self.auth_page.visit()
+        self.dashboard_page.visit()
+        new_org = 'orgX2'
+        self.assertFalse(self.dashboard_page.has_course(
+            org=new_org, number=self.course_number, run=self.course_run
+        ))
+        self.assertTrue(self.dashboard_page.new_course_button.present)
+
+        self.dashboard_page.click_new_course_button()
+        self.assertTrue(self.dashboard_page.is_new_course_form_visible())
+        self.dashboard_page.fill_new_course_form(
+            self.course_name, '', self.course_number, self.course_run
+        )
+        self.dashboard_page.course_org_field.fill('org')
+        self.dashboard_page.select_item_in_autocomplete_widget(new_org)
+        self.assertTrue(self.dashboard_page.is_new_course_form_valid())
+        self.dashboard_page.submit_new_course_form()
+
+        # Successful creation of course takes user to course outline page
+        course_outline_page = CourseOutlinePage(
+            self.browser,
+            new_org,
+            self.course_number,
+            self.course_run
+        )
+        course_outline_page.visit()
+        course_outline_page.wait_for_page()
+
+        # Go back to dashboard and verify newly created course exists there
+        self.dashboard_page.visit()
+        self.assertTrue(self.dashboard_page.has_course(
+            org=new_org, number=self.course_number, run=self.course_run
+        ))