diff --git a/app/views/shared/_address_fields.html.erb b/app/views/shared/_address_fields.html.erb
index 56c08ee..6346517 100644
--- a/app/views/shared/_address_fields.html.erb
+++ b/app/views/shared/_address_fields.html.erb
@@ -11,6 +11,6 @@
<%= form.form_group "#{field_name_prefix}address_country" do %>
<%= form.label "#{field_name_prefix}address_country" %>
- <%= form.country_select "#{field_name_prefix}address_country", { priority: %w(US CA), prompt: true }, class: "form-control custom-select" %>
+ <%= form.country_select "#{field_name_prefix}address_country", { selected: 'US', priority: %w(US CA), prompt: true }, class: "form-control custom-select" %>
<% end %>
diff --git a/spec/features/user_managing_acquired_media_releases_spec.rb b/spec/features/user_managing_acquired_media_releases_spec.rb
index cc23c62..6018c3a 100644
--- a/spec/features/user_managing_acquired_media_releases_spec.rb
+++ b/spec/features/user_managing_acquired_media_releases_spec.rb
@@ -5,6 +5,13 @@ feature "User managing acquired_media releases" do
let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
context "when signed out" do
+ scenario "United States is default country" do
+ contract_template = create(:contract_template, project: project)
+
+ visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template)
+ expect(country_field_value).to eq "US"
+ end
+
scenario "creating a release", js: true do
contract_template = create(:contract_template, project: project)
@@ -205,6 +212,10 @@ feature "User managing acquired_media releases" do
private
+ def country_field_value
+ find_field("acquired_media_release[person_address_country]").value
+ end
+
def acquired_media_name_field
"acquired_media_release[name]"
end
diff --git a/spec/features/user_managing_location_releases_spec.rb b/spec/features/user_managing_location_releases_spec.rb
index 9e8a32f..4871989 100644
--- a/spec/features/user_managing_location_releases_spec.rb
+++ b/spec/features/user_managing_location_releases_spec.rb
@@ -5,6 +5,13 @@ feature "User managing location releases" do
let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
context "when signed out" do
+ scenario "United States is default country" do
+ contract_template = create(:contract_template, project: project)
+
+ visit new_account_project_contract_template_location_release_path(project.account, project, contract_template)
+ expect(country_field_value).to eq "US"
+ end
+
scenario "creating a release", js: true do
contract_template = create(:contract_template, project: project)
@@ -195,6 +202,10 @@ feature "User managing location releases" do
private
+ def country_field_value
+ find_field("location_release[person_address_country]").value
+ end
+
def photos_heading(photos_count = 1)
t 'contracts.photos.heading', count: photos_count
end
diff --git a/spec/features/user_managing_material_releases_spec.rb b/spec/features/user_managing_material_releases_spec.rb
index 6a6e486..8a84b19 100644
--- a/spec/features/user_managing_material_releases_spec.rb
+++ b/spec/features/user_managing_material_releases_spec.rb
@@ -5,6 +5,13 @@ feature "User managing material releases" do
let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
context "when signed out" do
+ scenario "United States is default country" do
+ contract_template = create(:contract_template, project: project)
+
+ visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
+ expect(country_field_value).to eq "US"
+ end
+
scenario "creating a release", js: true do
contract_template = create(:contract_template, project: project)
@@ -180,6 +187,10 @@ feature "User managing material releases" do
private
+ def country_field_value
+ find_field("material_release[person_address_country]").value
+ end
+
def photos_heading(photos_count = 1)
t 'contracts.photos.heading', count: photos_count
end
diff --git a/spec/features/user_managing_talent_releases_spec.rb b/spec/features/user_managing_talent_releases_spec.rb
index 512cc85..2464c84 100644
--- a/spec/features/user_managing_talent_releases_spec.rb
+++ b/spec/features/user_managing_talent_releases_spec.rb
@@ -5,6 +5,13 @@ feature "User managing talent releases" do
let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
context "when signed out" do
+ scenario "United States is default country" do
+ contract_template = create(:contract_template, project: project)
+
+ visit new_account_project_contract_template_talent_release_path(project.account, project, contract_template)
+ expect(country_field_value).to eq "US"
+ end
+
scenario "creating a release for an adult", js: true do
contract_template = create(:contract_template, project: project)
@@ -274,6 +281,10 @@ feature "User managing talent releases" do
private
+ def country_field_value
+ find_field("talent_release[person_address_country]").value
+ end
+
def photos_heading(photos_count = 1)
t 'contracts.photos.heading', count: photos_count
end