Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
Enable parallel testing
Browse files Browse the repository at this point in the history 
This changes the database configuration to support parallel testing.

Cucumber features were broken up so that the longest running feature
(Forms) won't hold up the whole test suite.

Also includes fixes for the API tests. Since they share class names with
tests for the app controllers, they fail if executed in different
processes because of the way they share includes.
  • Loading branch information
@eedrummer @khennessy2
eedrummer authored and khennessy2 committed Apr 4, 2017
1 parent 6d48093 commit 919defa
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 172 deletions.
2 changes: 1 addition & 1 deletion config/database.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ development:
# Do not set this db to the same as development or production.
test: &test
<<: *default
database: <%=ENV['OPENSHIFT_POSTGRESQL_DB_NAME'] || 'vocabulary_test'%>
database: <%=ENV['OPENSHIFT_POSTGRESQL_DB_NAME'] || "vocabulary_test#{ENV['TEST_ENV_NUMBER']}" %>
username: <%=ENV['OPENSHIFT_POSTGRESQL_DB_USERNAME']%>
password: <%=ENV['OPENSHIFT_POSTGRESQL_DB_PASSWORD']%>
host: <%=ENV['OPENSHIFT_POSTGRESQL_DB_HOST']%>
Expand Down
144 changes: 144 additions & 0 deletions features/edit_forms.feature
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
Feature: Edit Forms
As an author
I want to edit Forms
Scenario: Edit a Draft Form
Given I have a Form with the name "Test Form" and the description "Form description"
And I am logged in as test_author@gmail.com
When I go to the list of Forms
And I click on the menu link for the Form with the name "Test Form"
And I click on the option to Details the Form with the name "Test Form"
Then I should see "Test Form"
Then I should see "Form description"
When I click on the "Edit" link
And I fill in the "name" field with "Edited Form"
And I click on the "Save" button
Then I should see "Name: Edited Form"
Then I should see "Form description"
And I should see "Publish"
And I should see "Edit"

Scenario: Revise Form
Given I have a published Form with the name "Test Form" and the description "Form description"
And I have a published Question with the content "What is your gender?" and the type "MC"
And I have a published Response Set with the name "Gender Partial"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the menu link for the Form with the name "Test Form"
And I click on the option to Revise the Form with the name "Test Form"
And I fill in the "name" field with "Gender Form"
And I fill in the "description" field with "Revised Description"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Partial"
And I click on the "Save" button
Then I should see "Name: Gender Form"
Then I should see "Revised Description"
And I should see "What is your gender?"
And I should see "Publish"
And I should see "Edit"

Scenario: Reorder Questions
Given I have a published Form with the name "Test Form"
And I have a Question with the content "What is your gender?" and the type "MC"
And I have a Question with the content "What is your name?" and the type "MC"
And I have a Response Set with the name "Gender Partial"
And I am logged in as test_author@gmail.com
When I go to the list of Forms
And I click on the menu link for the Form with the name "Test Form"
And I click on the option to Revise the Form with the name "Test Form"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I click on the "Add to Form" drop-down option for "What is your name?"
And I move the Question "What is your name?" up
And I move the Question "What is your name?" down
And I click on the "Save" button
And I should see "What is your gender?"

Scenario: Create New Form from List and Create a Question using New Question Modal
Given I have a Response Set with the name "Gender Full"
Given I have a Response Type with the name "Choice"
Given I have a Response Type with the name "Free Text"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
And I fill in the "description" field with "Form description"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Full"
And I click on the "Add New Question" button
And I fill in the "Question" field with "What is your favorite color?"
And I fill in the "question_description" field with "This is a description"
And I should see "No Response Sets selected"
Then I select the "Free Text" option in the "responseTypeId" list
And I should not see "No Response Sets selected"
And I click on the "Add Question" button
And I click on the "Save" button
Then I should see "Test Form"
And I should see "What is your gender?"
And I should see "What is your favorite color?"

Scenario: Create New Form from List and Create a Response Set using New Response Set Modal
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
And I fill in the "description" field with "Form description"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
Then I click on the "Add New Response Set" button
Then I fill in the "response_set_name" field with "New Response Set"
And I click on the "Add Response Set" button
And I use the response set search modal to select "New Response Set"
And I click on the "Save" button
Then I should see "Test Form"
And I should see "What is your gender?"

Scenario: Create New Form from List with warning modal
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
When I click on the "CDC Vocabulary Service" link
And I click on the "Save & Leave" button
And I wait 1 seconds
And I go to the dashboard
Then I should see "Test Form"

Scenario: Abandon New Form from List with warning modal
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the list of Forms
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
When I click on the "CDC Vocabulary Service" link
And I click on the "Continue Without Saving" button
When I go to the list of Forms
Then I should not see "Test Form"

Scenario: An invalid control number should not allow save
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Full"
And I click on the "Save" button
Then I should see "error(s) prohibited this form from being saved"
And I should see "controlNumber - must be a valid OMB Control Number"
29 changes: 29 additions & 0 deletions features/export_forms.feature
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Feature: Export Forms
As an author
I want to export Forms from the application
Scenario: Export Form
Given I have a Form with the name "Test Form"
And I have a Question with the content "What is your gender?" and the type "MC"
And I have a Response Set with the name "Gender Partial" and the description "Gender example" and with the Responses Male, Female
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Partial"
And I click on the "Save" button

Scenario: Export Form to Redcap
Given I have a Form with the name "Test Form"
And I have a Question with the content "What is your gender?" and the type "MC"
And I have a Response Set with the name "Gender Partial" and the description "Gender example" and with the Responses Male, Female
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Partial"
And I click on the "Save" button
Then I should see the "Export to Redcap" link
172 changes: 1 addition & 171 deletions features/manage_forms.feature
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Feature: Manage Forms
As an author
I want to create and manage Forms
I want to manage Forms
Scenario: Form List Details
Given I have a published Form with the name "Test Form"
And I am logged in as test_author@gmail.com
Expand Down Expand Up @@ -43,173 +43,3 @@ Feature: Manage Forms
Then I should not see "Publish"
And I should see "Revise"
And I should not see "Edit"

Scenario: Edit a Draft Form
Given I have a Form with the name "Test Form" and the description "Form description"
And I am logged in as test_author@gmail.com
When I go to the list of Forms
And I click on the menu link for the Form with the name "Test Form"
And I click on the option to Details the Form with the name "Test Form"
Then I should see "Test Form"
Then I should see "Form description"
When I click on the "Edit" link
And I fill in the "name" field with "Edited Form"
And I click on the "Save" button
Then I should see "Name: Edited Form"
Then I should see "Form description"
And I should see "Publish"
And I should see "Edit"

Scenario: Revise Form
Given I have a published Form with the name "Test Form" and the description "Form description"
And I have a published Question with the content "What is your gender?" and the type "MC"
And I have a published Response Set with the name "Gender Partial"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the menu link for the Form with the name "Test Form"
And I click on the option to Revise the Form with the name "Test Form"
And I fill in the "name" field with "Gender Form"
And I fill in the "description" field with "Revised Description"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Partial"
And I click on the "Save" button
Then I should see "Name: Gender Form"
Then I should see "Revised Description"
And I should see "What is your gender?"
And I should see "Publish"
And I should see "Edit"

Scenario: Reorder Questions
Given I have a published Form with the name "Test Form"
And I have a Question with the content "What is your gender?" and the type "MC"
And I have a Question with the content "What is your name?" and the type "MC"
And I have a Response Set with the name "Gender Partial"
And I am logged in as test_author@gmail.com
When I go to the list of Forms
And I click on the menu link for the Form with the name "Test Form"
And I click on the option to Revise the Form with the name "Test Form"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I click on the "Add to Form" drop-down option for "What is your name?"
And I move the Question "What is your name?" up
And I move the Question "What is your name?" down
And I click on the "Save" button
And I should see "What is your gender?"

Scenario: Create New Form from List and Create a Question using New Question Modal
Given I have a Response Set with the name "Gender Full"
Given I have a Response Type with the name "Choice"
Given I have a Response Type with the name "Free Text"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
And I fill in the "description" field with "Form description"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Full"
And I click on the "Add New Question" button
And I fill in the "Question" field with "What is your favorite color?"
And I fill in the "question_description" field with "This is a description"
And I should see "No Response Sets selected"
Then I select the "Free Text" option in the "responseTypeId" list
And I should not see "No Response Sets selected"
And I click on the "Add Question" button
And I click on the "Save" button
Then I should see "Test Form"
And I should see "What is your gender?"
And I should see "What is your favorite color?"

Scenario: Create New Form from List and Create a Response Set using New Response Set Modal
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
And I fill in the "description" field with "Form description"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
Then I click on the "Add New Response Set" button
Then I fill in the "response_set_name" field with "New Response Set"
And I click on the "Add Response Set" button
And I use the response set search modal to select "New Response Set"
And I click on the "Save" button
Then I should see "Test Form"
And I should see "What is your gender?"

Scenario: Create New Form from List with warning modal
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
When I click on the "CDC Vocabulary Service" link
And I click on the "Save & Leave" button
And I wait 1 seconds
And I go to the dashboard
Then I should see "Test Form"

Scenario: Abandon New Form from List with warning modal
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the list of Forms
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234-1234"
When I click on the "CDC Vocabulary Service" link
And I click on the "Continue Without Saving" button
When I go to the list of Forms
Then I should not see "Test Form"

Scenario: An invalid control number should not allow save
Given I have a Response Set with the name "Gender Full"
And I have a Question with the content "What is your gender?" and the type "MC"
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "controlNumber" field with "1234"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Full"
And I click on the "Save" button
Then I should see "error(s) prohibited this form from being saved"
And I should see "controlNumber - must be a valid OMB Control Number"

Scenario: Export Form
Given I have a Form with the name "Test Form"
And I have a Question with the content "What is your gender?" and the type "MC"
And I have a Response Set with the name "Gender Partial" and the description "Gender example" and with the Responses Male, Female
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Partial"
And I click on the "Save" button


Scenario: Export Form to Redcap
Given I have a Form with the name "Test Form"
And I have a Question with the content "What is your gender?" and the type "MC"
And I have a Response Set with the name "Gender Partial" and the description "Gender example" and with the Responses Male, Female
And I am logged in as test_author@gmail.com
When I go to the dashboard
And I click on the create "Forms" dropdown item
And I fill in the "name" field with "Test Form"
And I fill in the "search" field with "What"
And I click on the "Add to Form" drop-down option for "What is your gender?"
And I use the response set search modal to select "Gender Partial"
And I click on the "Save" button
Then I should see the "Export to Redcap" link
1 change: 1 addition & 0 deletions test/controllers/api/questions_controller_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class QuestionsControllerTest < ActionDispatch::IntegrationTest
include ActiveModelSerializers::Test::Schema
include ActiveModelSerializers::Test::Serializer
include Devise::Test::IntegrationHelpers

setup do
@question = questions(:one)
Expand Down
1 change: 1 addition & 0 deletions test/controllers/forms_controller_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class FormsControllerTest < ActionDispatch::IntegrationTest
include Devise::Test::IntegrationHelpers
include ActiveJob::TestHelper
include ActiveModelSerializers::Test::Schema

DRAFT = 'draft'.freeze
PUBLISHED = 'published'.freeze
Expand Down

0 comments on commit 919defa

Please sign in to comment.