<%= f.label :city, class: "label-required", for: "school_city" %>
- <%= f.text_field :city, placeholder: 'Berkeley', class: 'form-control',
+ <%= f.text_field :city, placeholder: 'Name of City', class: 'form-control',
required: false, id: 'school_city' %>
<%= f.label :state, class: "label-required", for: "school_state" %>
- <%= f.select :state, School::VALID_STATES, { include_blank: "State" }, { id: "state_select", class: 'form-control' } %>
+ <%= f.select :state, School::VALID_STATES, { include_blank: "Select a state" }, { id: "state_select", class: 'form-control' } %>
<%= f.label :state, for: "school_state" %>
- <%= f.text_field :state, placeholder: "State", class: 'form-control', id: "state_textfield" %>
+ <%= f.text_field :state, placeholder: "Name of State", class: 'form-control', id: "state_textfield" %>
<%= f.label :country, "Country", class: "label-required", for: "school_country" %>
<%= f.country_select(
:country,
- { priority_countries: ['United States'] },
+ { priority_countries: ['United States'], include_blank: "Select a country" },
{ class: 'form-control', required: false, id: 'school_country', format: :with_full_country_name, selected: 'United States'}
) %>
@@ -110,14 +110,18 @@
function handleCountryChange() {
if (countrySelected.val() === 'US') {
- stateSelectContainer.show().attr('required', true);
+ stateSelectContainer.show();
+ stateSelect.attr('required', '')
stateTextfieldContainer.hide();
stateTextfield.removeAttr('name');
stateSelect.attr('name', 'school[state]');
+
} else {
- stateTextfieldContainer.show().attr('required', false);
+ stateTextfieldContainer.show();
+ stateSelect.removeAttr('required') //else make state select not required
stateSelectContainer.hide();
+
stateSelect.removeAttr('name');
stateTextfield.attr('name', 'school[state]');
diff --git a/features/admin.feature b/features/admin.feature
index 3d1ba0e4..fcec4b12 100644
--- a/features/admin.feature
+++ b/features/admin.feature
@@ -198,7 +198,8 @@ Feature: basic admin functionality
And I set my application status as "Validated"
And I press "Update"
Then I see a confirmation "Saved"
- When I check "Validated"
+ When I go to the teachers page
+ And I check "Validated"
Then I should see "Bobby John"
Scenario: Deny teacher as an admin
@@ -362,6 +363,24 @@ Feature: basic admin functionality
Then I send a request info email
+ Scenario: Admin update info without mandatory field shows error
+ Given the following schools exist:
+ | name | country | city | state | website | grade_level | school_type |
+ | UC Berkeley | US | Berkeley | CA | https://www.berkeley.edu | university | public |
+ And the following teachers exist:
+ | first_name | last_name | admin | email | school |
+ | Jane | Doe | false | janedoe@berkeley.edu | UC Berkeley |
+ Given I am on the BJC home page
+ And I have an admin email
+ And I follow "Log In"
+ Then I can log in with Google
+ When I go to the teachers page
+ And I go to the edit page for Jane Doe
+ And I fill in "teacher_email" with ""
+ And I press "Update"
+ Then I should be on the edit page for Jane Doe
+
+
# Scenario: Admin can import csv file. The loader should filter invalid record and create associate school.
# Given the following schools exist:
# | name | country | city | state | website |
diff --git a/features/email_template.feature b/features/email_template.feature
index 36e96d97..e527204c 100644
--- a/features/email_template.feature
+++ b/features/email_template.feature
@@ -38,7 +38,7 @@ Scenario: Creating new email template with blank fields displays flash error
Given I am on the email templates index
And I press "New Email Templates"
When I press "Submit"
- Then I should see "Failed to submit information: Body cannot be blank, To cannot be blank"
+ Then I should see "An error occurred: Body can't be blank, To can't be blank"
Scenario: Creating and deleting new email template with valid fields succeeds
Given I am on the email templates index
@@ -59,7 +59,7 @@ Scenario: Editing email template to have blank body or to field displays flash e
And I follow "Welcome Email"
And I fill in "email_template_to" with ""
And I press "Submit"
- Then I should see "Failed to save Welcome Email template: To cannot be blank"
+ Then I should see "An error occurred: To can't be blank"
When I fill in TinyMCE email form with ""
And I press "Submit"
- Then I should see "Failed to save Welcome Email template: Body cannot be blank"
+ Then I should see "An error occurred: Body can't be blank"
diff --git a/features/school_form_submission.feature b/features/school_form_submission.feature
index 618aae17..0710f69a 100644
--- a/features/school_form_submission.feature
+++ b/features/school_form_submission.feature
@@ -70,7 +70,7 @@ Scenario: User can create an international school
And I fill in the school name selectize box with "Bucharest International School" and choose to add a new school
And I select "Romania" from "Country"
And I enter my "City" as "Bucharest"
- And I enter my "State" as "Bucharest, Sector 1"
+ And I fill in state with "Bucharest, Sector 1"
And I enter my "School Website" as "https://chs.fuhsd.org"
And I select "University" from "Grade Level"
And I select "Public" from "School Type"
@@ -90,7 +90,7 @@ Scenario: Admin can see international schools in the submission
And I fill in the school name selectize box with "Bucharest International School" and choose to add a new school
And I select "Romania" from "Country"
And I enter my "City" as "Bucharest"
- And I enter my "State" as "Bucharest, Sector 1"
+ And I fill in state with "Bucharest, Sector 1"
And I enter my "School Website" as "https://chs.fuhsd.org"
And I select "University" from "Grade Level"
And I select "Public" from "School Type"
diff --git a/features/step_definitions/form_steps.rb b/features/step_definitions/form_steps.rb
index f5d4621c..b1dbc9b7 100644
--- a/features/step_definitions/form_steps.rb
+++ b/features/step_definitions/form_steps.rb
@@ -110,6 +110,10 @@
find("#school_selectize").click.set(value)
end
+When(/^(?:|I )fill in state with "([^"]*)"$/) do |text|
+ fill_in("state_textfield", with: text)
+end
+
Then(/^the new teacher form should not be submitted$/) do
expect(current_path).to eq(new_teacher_path)
expect(page).to have_content("Your Information")
diff --git a/spec/controllers/schools_controller_spec.rb b/spec/controllers/schools_controller_spec.rb
index ee826722..791c5331 100644
--- a/spec/controllers/schools_controller_spec.rb
+++ b/spec/controllers/schools_controller_spec.rb
@@ -9,7 +9,7 @@
before(:all) do
@create_school_name = "University of California, Berkeley"
- @fail_flash_alert = /Failed to submit information :\(/
+ @fail_flash_error_text = "An error occurred: "
@success_flash_alert = Regexp.new("Created #{@create_school_name} successfully.")
end
@@ -72,7 +72,8 @@
}
}
expect(School.find_by(name: @create_school_name)).to be_nil
- expect(flash[:alert]).to match @fail_flash_alert
+ error = @fail_flash_error_text + "City can't be blank"
+ expect(flash[:alert]).to match error
post schools_path, params: {
school: {
@@ -88,7 +89,8 @@
}
}
expect(School.find_by(name: @create_school_name)).to be_nil
- expect(flash[:alert]).to match @fail_flash_alert
+ error = @fail_flash_error_text + "Website can't be blank, Website is invalid"
+ expect(flash[:alert]).to match error
post schools_path, params: {
school: {
@@ -104,7 +106,8 @@
}
}
expect(School.find_by(name: @create_school_name)).to be_nil
- expect(@fail_flash_alert).to match flash[:alert]
+ error = @fail_flash_error_text + "Name can't be blank"
+ expect(flash[:alert]).to match error
end
it "requires proper inputs for fields" do
@@ -124,7 +127,8 @@
}
}
expect(School.find_by(name: @create_school_name)).to be_nil
- expect(@fail_flash_alert).to match flash[:alert]
+ error = @fail_flash_error_text + "State is not included in the list"
+ expect(flash[:alert]).to match error
post schools_path, params: {
school: {
@@ -140,7 +144,8 @@
}
}
expect(School.find_by(name: @create_school_name)).to be_nil
- expect(@fail_flash_alert).to match flash[:alert]
+ error = @fail_flash_error_text + "Website is invalid"
+ expect(flash[:alert]).to match error
# Incorrect school type
expect { post schools_path, params: {
@@ -179,6 +184,43 @@
expect(School.find_by(name: @create_school_name)).to be_nil
end
+ it "does not allow invalid country" do
+ post schools_path, params: {
+ school: {
+ name: @create_school_name,
+ city: "Test City",
+ country: "XX", # invalid country
+ state: "CA",
+ website: "www.berkeley.edu",
+ school_type: "public",
+ grade_level: "university",
+ tags: [],
+ nces_id: 123456789000
+ }
+ }
+ expect(School.find_by(name: @create_school_name)).to be_nil
+ error = @fail_flash_error_text + "Country XX is not a valid country"
+ expect(flash[:alert]).to match error
+ end
+
+ it "allows any state when country is not US" do
+ post schools_path, params: {
+ school: {
+ name: @create_school_name,
+ city: "Ottawa",
+ country: "CA", # Canada
+ state: "Ontario",
+ website: "www.berkeley.edu",
+ school_type: "public",
+ grade_level: "university",
+ tags: [],
+ nces_id: 123456789000
+ }
+ }
+ expect(School.find_by(name: @create_school_name)).not_to be_nil
+ expect(@success_flash_alert).to match flash[:success]
+ end
+
it "does not create duplicate schools in the same city" do
expect(School.where(name: @create_school_name).count).to eq 0