Remove labels from genre icons (#37)

This commit is contained in:
Simon J
2021-08-30 13:01:59 +10:00
committed by GitHub
parent 89accef1e6
commit ca9bf2fc04
9 changed files with 8 additions and 226 deletions

View File

@@ -169,68 +169,6 @@ describe("config", () => {
});
});
});
describe("fontColor", () => {
describe("when BONOB_ICON_FONT_COLOR is not specified", () => {
it(`should default to undefined`, () => {
expect(config().icons.fontColor).toEqual(undefined);
});
});
describe("when BONOB_ICON_FONT_COLOR is ''", () => {
it(`should default to undefined`, () => {
process.env["BONOB_ICON_FONT_COLOR"] = "";
expect(config().icons.fontColor).toEqual(undefined);
});
});
describe("when BONOB_ICON_FONT_COLOR is specified", () => {
it(`should use it`, () => {
process.env["BONOB_ICON_FONT_COLOR"] = "pink";
expect(config().icons.fontColor).toEqual("pink");
});
});
describe("when BONOB_ICON_FONT_COLOR is an invalid string", () => {
it(`should blow up`, () => {
process.env["BONOB_ICON_FONT_COLOR"] = "#dfasd";
expect(() => config()).toThrow(
"Invalid color specified for BONOB_ICON_FONT_COLOR"
);
});
});
});
describe("fontFamily", () => {
describe("when BONOB_ICON_FONT_FAMILY is not specified", () => {
it(`should default to undefined`, () => {
expect(config().icons.fontFamily).toEqual(undefined);
});
});
describe("when BONOB_ICON_FONT_FAMILY is ''", () => {
it(`should default to undefined`, () => {
process.env["BONOB_ICON_FONT_FAMILY"] = "";
expect(config().icons.fontFamily).toEqual(undefined);
});
});
describe("when BONOB_ICON_FONT_FAMILY is specified", () => {
it(`should use it`, () => {
process.env["BONOB_ICON_FONT_FAMILY"] = "helveta";
expect(config().icons.fontFamily).toEqual("helveta");
});
});
describe("when BONOB_ICON_FONT_FAMILY is an invalid string", () => {
it(`should blow up`, () => {
process.env["BONOB_ICON_FONT_FAMILY"] = "#dfasd";
expect(() => config()).toThrow(
"Invalid color specified for BONOB_ICON_FONT_FAMILY"
);
});
});
});
});
describe("secret", () => {

View File

@@ -228,75 +228,6 @@ describe("SvgIcon", () => {
});
});
});
describe("with some text", () => {
describe("with no font color or style", () => {
describe("with no viewPort increase", () => {
it("should render the line", () => {
expect(
new SvgIcon(svgIcon24).with({ text: "hello" }).toString()
).toEqual(
xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path d="path1" />
<path d="path2" fill="none" stroke="#000"/>
<path d="path3" />
<g font-size="6" font-weight="bold">
<text x="2" y="19">hello</text>
</g>
</svg>
`)
);
});
});
describe("with a viewPort increase", () => {
it("should render the line", () => {
expect(
new SvgIcon(svgIcon24)
.with({ viewPortIncreasePercent: 50, text: "hello" })
.toString()
).toEqual(
xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -4 32 32">
<path d="path1" />
<path d="path2" fill="none" stroke="#000"/>
<path d="path3" />
<g font-size="9" font-weight="bold">
<text x="-1" y="24">hello</text>
</g>
</svg>
`)
);
});
});
});
describe("with no font color and style", () => {
it("should render the line", () => {
expect(
new SvgIcon(svgIcon24)
.with({
text: "hello world",
fontColor: "red",
fontFamily: "helvetica",
})
.toString()
).toEqual(
xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path d="path1" />
<path d="path2" fill="none" stroke="#000"/>
<path d="path3" />
<g font-size="6" font-weight="bold" font-family="helvetica" style="fill:red">
<text x="2" y="19">hello world</text>
</g>
</svg>
`)
);
});
});
});
});
class DummyIcon implements Icon {
@@ -315,8 +246,6 @@ describe("ColorOverridingIcon", () => {
const icon = new DummyIcon({
backgroundColor: "black",
foregroundColor: "black",
fontColor: "black",
fontFamily: "plain",
});
describe("overriding some options", () => {
@@ -338,8 +267,6 @@ describe("ColorOverridingIcon", () => {
viewPortIncreasePercent: 99,
backgroundColor: "blue",
foregroundColor: "red",
fontColor: "black",
fontFamily: "plain",
});
});
});
@@ -350,8 +277,6 @@ describe("ColorOverridingIcon", () => {
new DummyIcon({
backgroundColor: "blue",
foregroundColor: "red",
fontColor: "black",
fontFamily: "plain",
}).toString()
);
});
@@ -365,8 +290,6 @@ describe("ColorOverridingIcon", () => {
() => ({
backgroundColor: "blue",
foregroundColor: "red",
fontColor: "pink",
fontFamily: "fancy",
})
);
@@ -376,16 +299,12 @@ describe("ColorOverridingIcon", () => {
viewPortIncreasePercent: 99,
backgroundColor: "shouldBeIgnored",
foregroundColor: "shouldBeIgnored",
fontColor: "shouldBeIgnored",
fontFamily: "shouldBeIgnored",
}) as DummyIcon;
expect(result.transformation).toEqual({
viewPortIncreasePercent: 99,
backgroundColor: "blue",
foregroundColor: "red",
fontColor: "pink",
fontFamily: "fancy",
});
});
});
@@ -396,8 +315,6 @@ describe("ColorOverridingIcon", () => {
new DummyIcon({
backgroundColor: "blue",
foregroundColor: "red",
fontColor: "pink",
fontFamily: "fancy",
}).toString()
);
});
@@ -444,7 +361,6 @@ describe("makeFestive", () => {
const icon = new DummyIcon({
backgroundColor: "black",
foregroundColor: "black",
fontColor: "black",
});
let now = dayjs();
@@ -460,14 +376,12 @@ describe("makeFestive", () => {
viewPortIncreasePercent: 88,
backgroundColor: "shouldBeUsed",
foregroundColor: "shouldBeUsed",
fontColor: "shouldBeUsed",
}) as DummyIcon;
expect(result.transformation).toEqual({
viewPortIncreasePercent: 88,
backgroundColor: "shouldBeUsed",
foregroundColor: "shouldBeUsed",
fontColor: "shouldBeUsed",
});
});
});
@@ -482,14 +396,12 @@ describe("makeFestive", () => {
viewPortIncreasePercent: 25,
backgroundColor: "shouldNotBeUsed",
foregroundColor: "shouldNotBeUsed",
fontColor: "shouldNotBeUsed",
}) as DummyIcon;
expect(result.transformation).toEqual({
viewPortIncreasePercent: 25,
backgroundColor: "green",
foregroundColor: "red",
fontColor: "white",
});
});
});
@@ -504,14 +416,12 @@ describe("makeFestive", () => {
viewPortIncreasePercent: 12,
backgroundColor: "shouldNotBeUsed",
foregroundColor: "shouldNotBeUsed",
fontColor: "shouldNotBeUsed",
}) as DummyIcon;
expect(result.transformation).toEqual({
viewPortIncreasePercent: 12,
backgroundColor: "orange",
foregroundColor: "black",
fontColor: "orangered",
});
});
});
@@ -526,14 +436,12 @@ describe("makeFestive", () => {
viewPortIncreasePercent: 12,
backgroundColor: "shouldNotBeUsed",
foregroundColor: "shouldNotBeUsed",
fontColor: "shouldNotBeUsed",
}) as DummyIcon;
expect(result.transformation).toEqual({
viewPortIncreasePercent: 12,
backgroundColor: "red",
foregroundColor: "yellow",
fontColor: "crimson",
});
});
});
@@ -548,7 +456,6 @@ describe("makeFestive", () => {
viewPortIncreasePercent: 12,
backgroundColor: "shouldNotBeUsed",
foregroundColor: "shouldNotBeUsed",
fontColor: "shouldNotBeUsed",
}) as DummyIcon;
expect(result.transformation.viewPortIncreasePercent).toEqual(12);
@@ -558,15 +465,9 @@ describe("makeFestive", () => {
expect(
HOLI_COLORS.includes(result.transformation.foregroundColor!)
).toEqual(true);
expect(HOLI_COLORS.includes(result.transformation.fontColor!)).toEqual(
true
);
expect(result.transformation.backgroundColor).not.toEqual(
result.transformation.foregroundColor
);
expect(result.transformation.backgroundColor).not.toEqual(
result.transformation.fontColor
);
});
});
});

View File

@@ -1636,16 +1636,6 @@ describe("server", () => {
expect(svg).toContain(`fill="brightpink"`);
});
it("should return an icon with text if requested", async () => {
const response = await request(server(SystemClock)).get(
`/icon/${type}/size/180?text=foobar1000`
);
expect(response.status).toEqual(200);
const svg = Buffer.from(response.body).toString();
expect(svg).toContain(`foobar1000`);
});
it("should return a christmas icon on christmas day", async () => {
const response = await request(
server({ now: () => dayjs("2022/12/25") })

View File

@@ -1021,7 +1021,6 @@ describe("api", () => {
albumArtURI: iconArtURI(
bonobUrl,
iconForGenre(genre.name),
genre.name
).href(),
})),
index: 0,
@@ -1047,7 +1046,6 @@ describe("api", () => {
albumArtURI: iconArtURI(
bonobUrl,
iconForGenre(genre.name),
genre.name
).href(),
})),
index: 1,