Permalink
Browse files

Fixed failing tests after merge from master

  • Loading branch information...
1 parent a4ea113 commit 94a39594f8a509395f1499e4f7450123e999d2b3 Ethan Waldo committed Sep 10, 2010
View
@@ -23,7 +23,7 @@ group :default do
gem "httparty", "0.4.4"
gem "crack", "0.1.8"
gem "chronic", "0.2.3"
- gem "json_pure", "1.4.3"
+ gem "json_pure", "1.4.6"
gem "rubyforge", "2.0.4"
gem "hoe", "2.6.1"
gem "validatable", "1.6.7"
View
@@ -64,7 +64,7 @@ GEM
hpricot (0.6)
httparty (0.4.4)
crack (>= 0.1.1)
- json_pure (1.4.3)
+ json_pure (1.4.6)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
@@ -172,7 +172,7 @@ DEPENDENCIES
hoptoad_notifier (= 2.3.0)
hpricot (= 0.6)
httparty (= 0.4.4)
- json_pure (= 1.4.3)
+ json_pure (= 1.4.6)
launchy
libxml-ruby (= 1.1.3)
mdalessio-dryopteris (= 0.1.2)
@@ -72,7 +72,6 @@ Feature: Online importing users from a uploaded CSV file
Scenario: Reject the attempted upload of a file that is not truly CSV
Given I am logged in as "admin@ector.gov"
And I go to the user batch page for an admin
- And I follow "Batch Users"
And a jurisdiction named "Ector"
And I attach the fixture file at "fixtures/xls-file-named-csv.csv" to "Upload User CSV file"
And I press "Upload"
@@ -82,7 +81,6 @@ Feature: Online importing users from a uploaded CSV file
Scenario: Accept a CSV file that is malformed or not a user batch file and receive a rejection email
Given I am logged in as "admin@ector.gov"
And I go to the user batch page for an admin
- And I follow "Batch Users"
And a jurisdiction named "Ector"
And I attach the fixture file at "fixtures/badform.csv" to "Upload User CSV file"
And I press "Upload"
@@ -96,7 +94,6 @@ Feature: Online importing users from a uploaded CSV file
Scenario: Accept CSV file with extra/incorrect columns but proper format AND email column.
Given I am logged in as "admin@ector.gov"
And I go to the user batch page for an admin
- And I follow "Batch Users"
And a jurisdiction named "Ector"
And I attach the fixture file at "fixtures/wrongcols.csv" to "Upload User CSV file"
And I press "Upload"
@@ -70,9 +70,11 @@ Feature: Sending alerts form
Then I should see "Potter County" as a from jurisdiction option
Then I should not see "Tarrant County" as a from jurisdiction option
When I fill out the alert form with:
- | Jurisdiction | Potter County |
- | Title | H1N1 SNS push packs to be delivered tomorrow |
- | Delivery Time | 60 minutes |
+ | Jurisdiction | Potter County |
+ | Jurisdictions | Potter County |
+ | Title | H1N1 SNS push packs to be delivered tomorrow |
+ | Delivery Time | 60 minutes |
+ | Communication methods | E-mail |
And I press "Preview Message"
Then I should see a preview of the message with:
| Delivery Time | 60 minutes |
@@ -113,11 +113,10 @@ Feature: Searching for users
Scenario: Search for a user from a specific jurisdiction
Given I am logged in as "amy@example.com"
-
When I go to the dashboard page
And I follow "Find People"
And I fill in "Search" with "smith"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I select "Tarrant County" from "_jurisdiction_ids"
And I press "Search"
Then I see the following users in the search results
@@ -129,7 +128,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
And I fill in "Search" with "smith"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I select "Public" from "_role_ids"
And I press "Search"
Then I see the following users in the search results
@@ -141,7 +140,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
And I fill in "Search" with "body"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I select "Health Officer" from "_role_ids"
And I select "Dallas County" from "_jurisdiction_ids"
And I press "Search"
@@ -154,7 +153,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
And I fill in "Search" with "body"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I select "Immunization Director" from "_role_ids"
And I select "Dallas County" from "_jurisdiction_ids"
And I press "Search"
@@ -165,7 +164,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "First name" with "sam"
And I press "Search"
Then I see the following users in the search results
@@ -176,7 +175,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "Last name" with "body"
And I press "Search"
Then I see the following users in the search results
@@ -187,7 +186,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "Display name" with "sam body"
And I press "Search"
Then I see the following users in the search results
@@ -198,7 +197,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "Email" with "sam@example.com"
And I press "Search"
Then I see the following users in the search results
@@ -209,7 +208,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "Phone" with "888-555-1212"
And I press "Search"
Then I see the following users in the search results
@@ -220,7 +219,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "Job Title" with "Chief Bottle Washer"
And I press "Search"
Then I see the following users in the search results
@@ -231,7 +230,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "First name" with "Amy"
And I fill in "Last name" with "Body"
And I press "Search"
@@ -244,7 +243,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
- And I follow "Advance Search"
+ And I follow "Advanced Search"
And I fill in "First name" with "sa*"
And I press "Search"
Then I see the following users in the search results
@@ -267,6 +266,7 @@ Feature: Searching for users
When I go to the dashboard page
And I follow "Find People"
+ And I follow "Advanced Search"
And I select "Bee County" from "_jurisdiction_ids"
And I press "Search"

0 comments on commit 94a3959

Please sign in to comment.