- <%= @counter_notice.service_provider_name %>
- <%= @counter_notice.service_provider_address_line_1 %>
- <%= @counter_notice.service_provider_address_line_2 %>
- <%= @counter_notice.service_provider_address_line_3 %>
- <%= @counter_notice.service_provider_address_line_4 %>
- <%= @counter_notice.service_provider_phone %>
+ <%= @dmca_counter_notice.service_provider_name %>
+ <%= @dmca_counter_notice.service_provider_address_line_1 %>
+ <%= @dmca_counter_notice.service_provider_address_line_2 %>
+ <%= @dmca_counter_notice.service_provider_address_line_3 %>
+ <%= @dmca_counter_notice.service_provider_address_line_4 %>
+ <%= @dmca_counter_notice.service_provider_phone %>
<%= l(Date.today, format: :friendly_date) %>
RE: Mistaken Removal
-
Dear <%= @counter_notice.service_provider_name %>;
+ Dear <%= @dmca_counter_notice.service_provider_name %>;
Please find attached to this letter a list of material removed by you
pursuant to 17 U.S.C. Section 512. I have a good faith belief that this
@@ -23,7 +23,7 @@
misidentification of the material. I declare that this is true and accurate
under penalty of perjury under the laws of the United States of America.
- <% if @counter_notice.in_us? %>
+ <% if @dmca_counter_notice.in_us? %>
For the purposes of this matter, I consent to the jurisdiction of the
Federal District Court for the judicial district in which I reside.
@@ -57,12 +57,12 @@
- <%= @counter_notice.your_name %>
- <%= @counter_notice.your_phone %>
- <%= @counter_notice.your_address_line_1 %>
- <%= @counter_notice.your_address_line_2 %>
- <%= @counter_notice.your_address_line_3 %>
- <%= @counter_notice.your_address_line_4 %>
+
<%= @dmca_counter_notice.your_name %>
+ <%= @dmca_counter_notice.your_phone %>
+ <%= @dmca_counter_notice.your_address_line_1 %>
+ <%= @dmca_counter_notice.your_address_line_2 %>
+ <%= @dmca_counter_notice.your_address_line_3 %>
+ <%= @dmca_counter_notice.your_address_line_4 %>
Enclosure
diff --git a/app/views/notices/select_type.html.erb b/app/views/notices/select_type.html.erb
index 1f3a9b668..86f8b396d 100644
--- a/app/views/notices/select_type.html.erb
+++ b/app/views/notices/select_type.html.erb
@@ -32,7 +32,7 @@
<%=
link_to(
"Create DMCA Counter Notice",
- new_counter_notice_path,
+ new_dmca_counter_notice_path,
class: "button"
)
%>
diff --git a/app/views/notices/show.html.erb b/app/views/notices/show.html.erb
index cb9a82bba..1ebdfec0e 100644
--- a/app/views/notices/show.html.erb
+++ b/app/views/notices/show.html.erb
@@ -128,7 +128,7 @@
<%=
link_to(
"Create DMCA Counter Notice",
- new_counter_notice_path,
+ new_dmca_counter_notice_path,
class: "button"
)
%>
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index abfdc405d..3f20744e3 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -24,7 +24,7 @@
<%=
link_to(
"Create DMCA Counter Notice",
- new_counter_notice_path
+ new_dmca_counter_notice_path
)
%>
diff --git a/config/routes.rb b/config/routes.rb
index aab99112b..fa1435567 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,7 +18,7 @@
end
end
- resources :counter_notices, only: %i[new create]
+ resources :dmca_counter_notices, only: %i[new create]
namespace :entities do
resources :search, only: [:index]
diff --git a/spec/factories.rb b/spec/factories.rb
index 134caab1d..3af8e3f30 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -272,7 +272,7 @@
name 'test_role'
end
- factory :counter_notice do
+ factory :dmca_counter_notice do
attach_list_of_works true
list_removed_in_error true
perjury_risk_acknowledged true
diff --git a/spec/integration/user_submits_dmca_counternotice_spec.rb b/spec/integration/user_submits_dmca_counternotice_spec.rb
index 2f289a86a..e5b9f5e56 100644
--- a/spec/integration/user_submits_dmca_counternotice_spec.rb
+++ b/spec/integration/user_submits_dmca_counternotice_spec.rb
@@ -3,7 +3,7 @@
feature "DMCA counter notices" do
scenario "A user submits a DMCA counter notice" do
- counternotice = CounterNoticeOnPage.new
+ counternotice = DMCACounterNoticeOnPage.new
counternotice.visit_counter_notice_page
diff --git a/spec/models/counter_notice_spec.rb b/spec/models/dmca_counter_notice_spec.rb
similarity index 77%
rename from spec/models/counter_notice_spec.rb
rename to spec/models/dmca_counter_notice_spec.rb
index 826a31809..9878f1da0 100644
--- a/spec/models/counter_notice_spec.rb
+++ b/spec/models/dmca_counter_notice_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-RSpec.describe CounterNotice, type: :model do
+RSpec.describe DMCACounterNotice, type: :model do
it { is_expected.to validate_presence_of :attach_list_of_works }
it { is_expected.to validate_presence_of :list_removed_in_error }
it { is_expected.to validate_presence_of :perjury_risk_acknowledged }
@@ -9,16 +9,15 @@
context "jurisdictions" do
it "knows when it's in the US" do
- counter_notice = build(:counter_notice, :in_us)
+ counter_notice = build(:dmca_counter_notice, :in_us)
expect(counter_notice.in_us?).to be_truthy
end
it "knows when it's outside the US" do
- counter_notice = build(:counter_notice, :outside_us)
+ counter_notice = build(:dmca_counter_notice, :outside_us)
expect(counter_notice.in_us?).to be_falsey
end
end
-
end
diff --git a/spec/support/page_objects/counter_notice_on_page.rb b/spec/support/page_objects/dmca_counter_notice_on_page.rb
similarity index 87%
rename from spec/support/page_objects/counter_notice_on_page.rb
rename to spec/support/page_objects/dmca_counter_notice_on_page.rb
index 8da4c1302..67bbd4c4c 100644
--- a/spec/support/page_objects/counter_notice_on_page.rb
+++ b/spec/support/page_objects/dmca_counter_notice_on_page.rb
@@ -1,13 +1,13 @@
require_relative '../page_object'
-class CounterNoticeOnPage < PageObject
+class DMCACounterNoticeOnPage < PageObject
def choose_radio_option(option)
choose(option)
end
def visit_counter_notice_page
- visit '/counter_notices/new'
+ visit '/dmca_counter_notices/new'
end
def fill_in_user_form_with(attributes)