From f898f7292026ab563bae6833cf705a9e4397be2e Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 24 Sep 2013 11:42:11 -0400 Subject: [PATCH] Added tags to acceptance tests to define multiple shards. --- .../features/advanced-settings.feature | 1 + .../contentstore/features/checklists.feature | 1 + .../contentstore/features/component.feature | 1 + .../features/course-overview.feature | 1 + .../features/course-settings.feature | 1 + .../contentstore/features/course-team.feature | 1 + .../features/course-updates.feature | 1 + .../contentstore/features/courses.feature | 1 + .../features/discussion-editor.feature | 1 + .../contentstore/features/grading.feature | 1 + .../contentstore/features/html-editor.feature | 1 + .../features/problem-editor.feature | 1 + .../contentstore/features/section.feature | 1 + .../contentstore/features/signup.feature | 1 + .../features/static-pages.feature | 1 + .../contentstore/features/subsection.feature | 1 + .../contentstore/features/textbooks.feature | 1 + .../contentstore/features/upload.feature | 1 + .../features/video-editor.feature | 1 + .../contentstore/features/video.feature | 1 + .../courseware/features/certificates.feature | 1 + .../courseware/features/help.feature | 1 + .../features/high-level-tabs.feature | 1 + .../courseware/features/homepage.feature | 1 + .../courseware/features/login.feature | 1 + .../courseware/features/lti.feature | 3 +- .../courseware/features/navigation.feature | 1 + .../courseware/features/problems.feature | 1 + .../courseware/features/registration.feature | 7 +-- .../courseware/features/signup.feature | 1 + .../courseware/features/video.feature | 53 ++++++++++--------- .../courseware/features/word_cloud.feature | 21 ++++---- 32 files changed, 72 insertions(+), 40 deletions(-) diff --git a/cms/djangoapps/contentstore/features/advanced-settings.feature b/cms/djangoapps/contentstore/features/advanced-settings.feature index b2941ac7a5..4af1e69ff4 100644 --- a/cms/djangoapps/contentstore/features/advanced-settings.feature +++ b/cms/djangoapps/contentstore/features/advanced-settings.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Advanced (manual) course policy In order to specify course policy settings for which no custom user interface exists I want to be able to manually enter JSON key /value pairs diff --git a/cms/djangoapps/contentstore/features/checklists.feature b/cms/djangoapps/contentstore/features/checklists.feature index 6289df9cfc..f6e1fbff55 100644 --- a/cms/djangoapps/contentstore/features/checklists.feature +++ b/cms/djangoapps/contentstore/features/checklists.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Course checklists Scenario: A course author sees checklists defined by edX diff --git a/cms/djangoapps/contentstore/features/component.feature b/cms/djangoapps/contentstore/features/component.feature index a30ce96ae6..dc2eceeead 100644 --- a/cms/djangoapps/contentstore/features/component.feature +++ b/cms/djangoapps/contentstore/features/component.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Component Adding As a course author, I want to be able to add a wide variety of components diff --git a/cms/djangoapps/contentstore/features/course-overview.feature b/cms/djangoapps/contentstore/features/course-overview.feature index 2cbb22ddd7..77848ae3e0 100644 --- a/cms/djangoapps/contentstore/features/course-overview.feature +++ b/cms/djangoapps/contentstore/features/course-overview.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Course Overview In order to quickly view the details of a course's section and set release dates and grading As a course author diff --git a/cms/djangoapps/contentstore/features/course-settings.feature b/cms/djangoapps/contentstore/features/course-settings.feature index be457de959..be19dc0f12 100644 --- a/cms/djangoapps/contentstore/features/course-settings.feature +++ b/cms/djangoapps/contentstore/features/course-settings.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Course Settings As a course author, I want to be able to configure my course settings. diff --git a/cms/djangoapps/contentstore/features/course-team.feature b/cms/djangoapps/contentstore/features/course-team.feature index de5bb6556a..b5415d852e 100644 --- a/cms/djangoapps/contentstore/features/course-team.feature +++ b/cms/djangoapps/contentstore/features/course-team.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Course Team As a course author, I want to be able to add others to my team diff --git a/cms/djangoapps/contentstore/features/course-updates.feature b/cms/djangoapps/contentstore/features/course-updates.feature index bc73479c5f..ce9a440248 100644 --- a/cms/djangoapps/contentstore/features/course-updates.feature +++ b/cms/djangoapps/contentstore/features/course-updates.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Course updates As a course author, I want to be able to provide updates to my students diff --git a/cms/djangoapps/contentstore/features/courses.feature b/cms/djangoapps/contentstore/features/courses.feature index e762d0b8a6..686c08188a 100644 --- a/cms/djangoapps/contentstore/features/courses.feature +++ b/cms/djangoapps/contentstore/features/courses.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Create Course In order offer a course on the edX platform As a course author diff --git a/cms/djangoapps/contentstore/features/discussion-editor.feature b/cms/djangoapps/contentstore/features/discussion-editor.feature index e4b1f5450b..1193342533 100644 --- a/cms/djangoapps/contentstore/features/discussion-editor.feature +++ b/cms/djangoapps/contentstore/features/discussion-editor.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Discussion Component Editor As a course author, I want to be able to create discussion components. diff --git a/cms/djangoapps/contentstore/features/grading.feature b/cms/djangoapps/contentstore/features/grading.feature index d741af42e2..2876186f74 100644 --- a/cms/djangoapps/contentstore/features/grading.feature +++ b/cms/djangoapps/contentstore/features/grading.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Course Grading As a course author, I want to be able to configure how my course is graded diff --git a/cms/djangoapps/contentstore/features/html-editor.feature b/cms/djangoapps/contentstore/features/html-editor.feature index 4419d6018b..a242c01ffa 100644 --- a/cms/djangoapps/contentstore/features/html-editor.feature +++ b/cms/djangoapps/contentstore/features/html-editor.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: HTML Editor As a course author, I want to be able to create HTML blocks. diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature index 1296acec1c..2945afecec 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.feature +++ b/cms/djangoapps/contentstore/features/problem-editor.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Problem Editor As a course author, I want to be able to create problems and edit their settings. diff --git a/cms/djangoapps/contentstore/features/section.feature b/cms/djangoapps/contentstore/features/section.feature index 6402db1bcb..deaa2de6bd 100644 --- a/cms/djangoapps/contentstore/features/section.feature +++ b/cms/djangoapps/contentstore/features/section.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Create Section In order offer a course on the edX platform As a course author diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature index c249ad61e8..6da7c55d70 100644 --- a/cms/djangoapps/contentstore/features/signup.feature +++ b/cms/djangoapps/contentstore/features/signup.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Sign in In order to use the edX content As a new user diff --git a/cms/djangoapps/contentstore/features/static-pages.feature b/cms/djangoapps/contentstore/features/static-pages.feature index 525c0cdb83..b193f81362 100644 --- a/cms/djangoapps/contentstore/features/static-pages.feature +++ b/cms/djangoapps/contentstore/features/static-pages.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Static Pages As a course author, I want to be able to add static pages diff --git a/cms/djangoapps/contentstore/features/subsection.feature b/cms/djangoapps/contentstore/features/subsection.feature index 6703c60c3b..82d3f1e425 100644 --- a/cms/djangoapps/contentstore/features/subsection.feature +++ b/cms/djangoapps/contentstore/features/subsection.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Create Subsection In order offer a course on the edX platform As a course author diff --git a/cms/djangoapps/contentstore/features/textbooks.feature b/cms/djangoapps/contentstore/features/textbooks.feature index 36de10daa1..4215d05de7 100644 --- a/cms/djangoapps/contentstore/features/textbooks.feature +++ b/cms/djangoapps/contentstore/features/textbooks.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Textbooks Scenario: No textbooks diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature index 1a2e25fcd3..a0adf6b403 100644 --- a/cms/djangoapps/contentstore/features/upload.feature +++ b/cms/djangoapps/contentstore/features/upload.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Upload Files As a course author, I want to be able to upload files for my students diff --git a/cms/djangoapps/contentstore/features/video-editor.feature b/cms/djangoapps/contentstore/features/video-editor.feature index 9665046939..e8e2a26c9c 100644 --- a/cms/djangoapps/contentstore/features/video-editor.feature +++ b/cms/djangoapps/contentstore/features/video-editor.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Video Component Editor As a course author, I want to be able to create video components. diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature index a6a4cec28b..da1de109d2 100644 --- a/cms/djangoapps/contentstore/features/video.feature +++ b/cms/djangoapps/contentstore/features/video.feature @@ -1,3 +1,4 @@ +@shard_3 Feature: Video Component As a course author, I want to be able to view my created videos in Studio. diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature index fc56a10358..ec7c5474ad 100644 --- a/lms/djangoapps/courseware/features/certificates.feature +++ b/lms/djangoapps/courseware/features/certificates.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Verified certificates As a student, In order to earn a verified certificate diff --git a/lms/djangoapps/courseware/features/help.feature b/lms/djangoapps/courseware/features/help.feature index 61305b7cfa..50e311e0f7 100644 --- a/lms/djangoapps/courseware/features/help.feature +++ b/lms/djangoapps/courseware/features/help.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: The help module should work In order to get help As a student diff --git a/lms/djangoapps/courseware/features/high-level-tabs.feature b/lms/djangoapps/courseware/features/high-level-tabs.feature index adbe5ec8a3..ea6f1c90b7 100644 --- a/lms/djangoapps/courseware/features/high-level-tabs.feature +++ b/lms/djangoapps/courseware/features/high-level-tabs.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: All the high level tabs should work In order to preview the courseware As a student diff --git a/lms/djangoapps/courseware/features/homepage.feature b/lms/djangoapps/courseware/features/homepage.feature index 140f1f8b5f..6c1baf4051 100644 --- a/lms/djangoapps/courseware/features/homepage.feature +++ b/lms/djangoapps/courseware/features/homepage.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Homepage for web users In order to get an idea what edX is about As a an anonymous web user diff --git a/lms/djangoapps/courseware/features/login.feature b/lms/djangoapps/courseware/features/login.feature index 4165a9bb9f..9830504449 100644 --- a/lms/djangoapps/courseware/features/login.feature +++ b/lms/djangoapps/courseware/features/login.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Login in as a registered user As a registered user In order to access my content diff --git a/lms/djangoapps/courseware/features/lti.feature b/lms/djangoapps/courseware/features/lti.feature index abdcfdb704..7d4fd56c01 100644 --- a/lms/djangoapps/courseware/features/lti.feature +++ b/lms/djangoapps/courseware/features/lti.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: LTI component As a student, I want to view LTI component in LMS. @@ -14,4 +15,4 @@ Feature: LTI component Scenario: LTI component in LMS is rendered incorrectly Given the course has incorrect LTI credentials And the course has an LTI component filled with correct fields - Then I view the LTI but incorrect_signature warning is rendered \ No newline at end of file + Then I view the LTI but incorrect_signature warning is rendered diff --git a/lms/djangoapps/courseware/features/navigation.feature b/lms/djangoapps/courseware/features/navigation.feature index 8fd8b54c1a..20a9564847 100644 --- a/lms/djangoapps/courseware/features/navigation.feature +++ b/lms/djangoapps/courseware/features/navigation.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Navigate Course As a student in an edX course In order to view the course properly diff --git a/lms/djangoapps/courseware/features/problems.feature b/lms/djangoapps/courseware/features/problems.feature index ad70e5a062..e307f617d0 100644 --- a/lms/djangoapps/courseware/features/problems.feature +++ b/lms/djangoapps/courseware/features/problems.feature @@ -1,3 +1,4 @@ +@shard_1 Feature: Answer problems As a student in an edX course In order to test my understanding of the material diff --git a/lms/djangoapps/courseware/features/registration.feature b/lms/djangoapps/courseware/features/registration.feature index b8115b52c5..54df31ae7d 100644 --- a/lms/djangoapps/courseware/features/registration.feature +++ b/lms/djangoapps/courseware/features/registration.feature @@ -1,16 +1,17 @@ +@shard_1 Feature: Register for a course As a registered user In order to access my class content I want to register for a class on the edX website - Scenario: I can register for a course + Scenario: I can register for a course Given The course "6.002x" exists And I am logged in And I visit the courses page When I register for the course "6.002x" - Then I should see the course numbered "6.002x" in my dashboard + Then I should see the course numbered "6.002x" in my dashboard - Scenario: I can unregister for a course + Scenario: I can unregister for a course Given I am registered for the course "6.002x" And I visit the dashboard Then I should see the course numbered "6.002x" in my dashboard diff --git a/lms/djangoapps/courseware/features/signup.feature b/lms/djangoapps/courseware/features/signup.feature index 3c9f491f7d..ae6a2c6c5f 100644 --- a/lms/djangoapps/courseware/features/signup.feature +++ b/lms/djangoapps/courseware/features/signup.feature @@ -1,3 +1,4 @@ +@shard_2 Feature: Sign in In order to use the edX content As a new user diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature index cf30c55cbf..824a86806e 100644 --- a/lms/djangoapps/courseware/features/video.feature +++ b/lms/djangoapps/courseware/features/video.feature @@ -1,39 +1,40 @@ +@shard_2 Feature: Video component As a student, I want to view course videos in LMS. Scenario: Video component is fully rendered in the LMS in HTML5 mode - Given the course has a Video component in HTML5 mode - Then when I view the video it has rendered in HTML5 mode - And all sources are correct + Given the course has a Video component in HTML5 mode + Then when I view the video it has rendered in HTML5 mode + And all sources are correct # Firefox doesn't have HTML5 (only mp4 - fix here) @skip_firefox Scenario: Autoplay is disabled in LMS for a Video component - Given the course has a Video component in HTML5 mode - Then when I view the video it does not have autoplay enabled + Given the course has a Video component in HTML5 mode + Then when I view the video it does not have autoplay enabled -# Youtube testing -Scenario: Video component is fully rendered in the LMS in Youtube mode with HTML5 sources -Given youtube server is up and response time is 0.4 seconds -And the course has a Video component in Youtube_HTML5 mode -Then when I view the video it has rendered in Youtube mode + # Youtube testing + Scenario: Video component is fully rendered in the LMS in Youtube mode with HTML5 sources + Given youtube server is up and response time is 0.4 seconds + And the course has a Video component in Youtube_HTML5 mode + Then when I view the video it has rendered in Youtube mode -Scenario: Video component is not rendered in the LMS in Youtube mode with HTML5 sources -Given youtube server is up and response time is 2 seconds -And the course has a Video component in Youtube_HTML5 mode -Then when I view the video it has rendered in HTML5 mode + Scenario: Video component is not rendered in the LMS in Youtube mode with HTML5 sources + Given youtube server is up and response time is 2 seconds + And the course has a Video component in Youtube_HTML5 mode + Then when I view the video it has rendered in HTML5 mode -Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources -Given youtube server is up and response time is 2 seconds -And the course has a Video component in Youtube mode -Then when I view the video it has rendered in Youtube mode + Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources + Given youtube server is up and response time is 2 seconds + And the course has a Video component in Youtube mode + Then when I view the video it has rendered in Youtube mode -Scenario: Video component is rendered in the LMS in Youtube mode with HTML5 sources that doesn't supported by browser -Given youtube server is up and response time is 2 seconds -And the course has a Video component in Youtube_HTML5_Unsupported_Video mode -Then when I view the video it has rendered in Youtube mode + Scenario: Video component is rendered in the LMS in Youtube mode with HTML5 sources that doesn't supported by browser + Given youtube server is up and response time is 2 seconds + And the course has a Video component in Youtube_HTML5_Unsupported_Video mode + Then when I view the video it has rendered in Youtube mode -Scenario: Video component is rendered in the LMS in HTML5 mode with HTML5 sources that doesn't supported by browser -Given the course has a Video component in HTML5_Unsupported_Video mode -Then error message is shown -And error message has correct text + Scenario: Video component is rendered in the LMS in HTML5 mode with HTML5 sources that doesn't supported by browser + Given the course has a Video component in HTML5_Unsupported_Video mode + Then error message is shown + And error message has correct text diff --git a/lms/djangoapps/courseware/features/word_cloud.feature b/lms/djangoapps/courseware/features/word_cloud.feature index 0d5baa46e1..761fa64c00 100644 --- a/lms/djangoapps/courseware/features/word_cloud.feature +++ b/lms/djangoapps/courseware/features/word_cloud.feature @@ -1,15 +1,16 @@ +@shard_2 Feature: World Cloud component - As a student, I want to view Word Cloud component in LMS. + As a student, I want to view Word Cloud component in LMS. Scenario: Word Cloud component in LMS is rendered with empty result - Given the course has a Word Cloud component - Then I view the word cloud and it has rendered - When I press the Save button - Then I see the empty result + Given the course has a Word Cloud component + Then I view the word cloud and it has rendered + When I press the Save button + Then I see the empty result Scenario: Word Cloud component in LMS is rendered with result - Given the course has a Word Cloud component - Then I view the word cloud and it has rendered - When I fill inputs - And I press the Save button - Then I see the result with words count \ No newline at end of file + Given the course has a Word Cloud component + Then I view the word cloud and it has rendered + When I fill inputs + And I press the Save button + Then I see the result with words count