Skip to content

Commit 7e83f18

Browse files
authored
Renamed display ad leftovers (test descriptions, swagger) (forem#20007)
1 parent f4a9c19 commit 7e83f18

File tree

6 files changed

+537
-537
lines changed

6 files changed

+537
-537
lines changed

spec/factories/articles.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
experience_level_rating { rand(4..6) }
3636
# The tags property in the markdown is a bit of a hack, and this entire factory needs refactoring.
37-
# In the Tagglable spec we want to extract some common scopes from the article and display ad
37+
# In the Tagglable spec we want to extract some common scopes from the article and billboard
3838
# models and test them, hence we want to pass through the tag_list property.
3939
# However, the body_markdown caters for the way that we associate tags for the v1 editor.
4040
# Hence, in this test we default to the transient with_tags being set to true, but if we pass a tag_list through

spec/lib/data_update_scripts/generate_display_ad_names_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
describe DataUpdateScripts::GenerateDisplayAdNames do
77
context "when there is no name for a billboard" do
8-
it "generates a name for an existing Display Ad" do
8+
it "generates a name for an existing Billboard" do
99
billboard = create(:billboard, name: nil)
1010

1111
described_class.new.run
1212
expect(billboard.reload.name).to eq("Billboard #{billboard.id}")
1313
end
1414
end
1515

16-
context "when there is a name for the Display Ad" do
16+
context "when there is a name for the Billboard" do
1717
it "does not change the name" do
1818
billboard = create(:billboard, name: "Test")
1919

spec/requests/admin/billboards_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
describe "DELETE /admin/billboards/:id" do
100100
let!(:billboard) { create(:billboard) }
101101

102-
it "deletes the Display Ad" do
102+
it "deletes the Billboard" do
103103
expect do
104104
delete admin_billboard_path(billboard.id)
105105
end.to change { Billboard.all.count }.by(-1)
@@ -147,7 +147,7 @@
147147
describe "DELETE /admin/billboards/:id" do
148148
let!(:billboard) { create(:billboard) }
149149

150-
it "deletes the Display Ad" do
150+
it "deletes the Billboard" do
151151
expect do
152152
delete admin_billboard_path(billboard.id)
153153
end.to change { Billboard.all.count }.by(-1)

spec/requests/admin/html_variants_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
describe "DELETE /admin/customization/html_variants/:id" do
6767
let!(:html_variant) { create(:html_variant) }
6868

69-
it "deletes the Display Ad" do
69+
it "deletes the Billboard" do
7070
expect do
7171
delete admin_html_variant_path(html_variant.id)
7272
end.to change { HtmlVariant.all.count }.by(-1)
@@ -110,7 +110,7 @@
110110
describe "DELETE /admin/customization/html_variants/:id" do
111111
let!(:html_variant) { create(:html_variant) }
112112

113-
it "deletes the Display Ad" do
113+
it "deletes the Billboard" do
114114
expect do
115115
delete admin_html_variant_path(html_variant.id)
116116
end.to change { HtmlVariant.all.count }.by(-1)

spec/swagger_helper.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,10 @@
399399
}
400400
},
401401
Billboard: {
402-
description: "A Display Ad, aka Billboard, aka Widget",
402+
description: "Billboard, aka Widget, ex. Display Ad",
403403
type: :object,
404404
properties: {
405-
id: { type: :integer, description: "The ID of the Display Ad" },
405+
id: { type: :integer, description: "The ID of the Billboard" },
406406
name: { type: :string, description: "For internal use, helps distinguish ads from one another" },
407407
body_markdown: { type: :string, description: "The text (in markdown) of the ad (required)" },
408408
approved: { type: :boolean, description: "Ad must be both published and approved to be in rotation" },

0 commit comments

Comments
 (0)