Skip to content

Commit cd89d1d

Browse files
Update iOS/iPadOS enrollment label to match Android copy
Change the iOS/iPadOS Add Hosts modal label from 'Send this to your end users:' to 'Enrollment instructions:' for consistency with the Android enrollment panel. Closes #42721
1 parent 17bfa99 commit cd89d1d

2 files changed

Lines changed: 16 additions & 18 deletions

File tree

frontend/components/AddHostsModal/AddHostsModal.tests.tsx

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe("AddHostsModal", () => {
2121
});
2222

2323
render(
24-
<AddHostsModal isAnyTeamSelected={false} isLoading onCancel={noop} />
24+
<AddHostsModal isAnyTeamSelected={false} isLoading onCancel={noop} />,
2525
);
2626
const loadingSpinner = screen.getByTestId("spinner");
2727
expect(loadingSpinner).toBeVisible();
@@ -44,7 +44,7 @@ describe("AddHostsModal", () => {
4444
enrollSecret={ENROLL_SECRET}
4545
isLoading={false}
4646
onCancel={noop}
47-
/>
47+
/>,
4848
);
4949

5050
await user.click(screen.getByRole("tab", { name: "macOS" }));
@@ -65,7 +65,7 @@ describe("AddHostsModal", () => {
6565

6666
await user.click(screen.getByRole("tab", { name: "ChromeOS" }));
6767
const extensionId = screen.getByDisplayValue(
68-
/fleeedmmihkfkeemmipgmhhjemlljidg/i
68+
/fleeedmmihkfkeemmipgmhhjemlljidg/i,
6969
);
7070
expect(extensionId).toBeInTheDocument();
7171
expect(screen.queryByText(/--enable-scripts/i)).not.toBeInTheDocument();
@@ -83,11 +83,11 @@ describe("AddHostsModal", () => {
8383

8484
await user.click(screen.getByText(/Plain osquery/i));
8585
const downloadEnrollSecret = screen.getByText(
86-
/Download your enroll secret/i
86+
/Download your enroll secret/i,
8787
);
8888
expect(downloadEnrollSecret).toBeInTheDocument();
8989
const osquerydCommand = screen.getByDisplayValue(
90-
/osqueryd --flagfile=flagfile.txt --verbose/i
90+
/osqueryd --flagfile=flagfile.txt --verbose/i,
9191
);
9292
expect(osquerydCommand).toBeInTheDocument();
9393
expect(screen.queryByText(/--enable-scripts/i)).not.toBeInTheDocument();
@@ -111,13 +111,11 @@ describe("AddHostsModal", () => {
111111
enrollSecret={ENROLL_SECRET}
112112
isLoading={false}
113113
onCancel={noop}
114-
/>
114+
/>,
115115
);
116116

117117
await user.click(screen.getByRole("tab", { name: "iOS & iPadOS" }));
118-
expect(
119-
screen.queryByText(/Send this to your end users:/i)
120-
).toBeInTheDocument();
118+
expect(screen.queryByText(/Enrollment instructions:/i)).toBeInTheDocument();
121119
});
122120

123121
it("renders enroll url input for android if android mdm is enabled", async () => {
@@ -138,7 +136,7 @@ describe("AddHostsModal", () => {
138136
enrollSecret={ENROLL_SECRET}
139137
isLoading={false}
140138
onCancel={noop}
141-
/>
139+
/>,
142140
);
143141

144142
await user.click(screen.getByRole("tab", { name: "Android" }));
@@ -162,7 +160,7 @@ describe("AddHostsModal", () => {
162160
enrollSecret={ENROLL_SECRET}
163161
isLoading={false}
164162
onCancel={noop}
165-
/>
163+
/>,
166164
);
167165

168166
const regex = new RegExp(`${ENROLL_SECRET}`);
@@ -188,7 +186,7 @@ describe("AddHostsModal", () => {
188186
isLoading={false}
189187
onCancel={noop}
190188
openEnrollSecretModal={noop}
191-
/>
189+
/>,
192190
);
193191

194192
const text = screen.getByText("Something's gone wrong.");
@@ -220,7 +218,7 @@ describe("AddHostsModal", () => {
220218
enrollSecret={ENROLL_SECRET}
221219
isLoading={false}
222220
onCancel={noop}
223-
/>
221+
/>,
224222
);
225223

226224
await user.click(screen.getByRole("tab", { name: "macOS" }));
@@ -240,7 +238,7 @@ describe("AddHostsModal", () => {
240238

241239
await user.click(screen.getByRole("tab", { name: "ChromeOS" }));
242240
const extensionId = screen.getByDisplayValue(
243-
/fleeedmmihkfkeemmipgmhhjemlljidg/i
241+
/fleeedmmihkfkeemmipgmhhjemlljidg/i,
244242
);
245243
expect(extensionId).toBeInTheDocument();
246244
expect(screen.queryByText(/--enable-scripts/i)).not.toBeInTheDocument();
@@ -252,11 +250,11 @@ describe("AddHostsModal", () => {
252250

253251
await user.click(screen.getByText(/Plain osquery/i));
254252
const downloadEnrollSecret = screen.getByText(
255-
/Download your enroll secret/i
253+
/Download your enroll secret/i,
256254
);
257255
expect(downloadEnrollSecret).toBeInTheDocument();
258256
const osquerydCommand = screen.getByDisplayValue(
259-
/osqueryd --flagfile=flagfile.txt --verbose/i
257+
/osqueryd --flagfile=flagfile.txt --verbose/i,
260258
);
261259
expect(osquerydCommand).toBeInTheDocument();
262260
expect(screen.queryByText(/--enable-scripts/i)).not.toBeInTheDocument();

frontend/components/AddHostsModal/PlatformWrapper/IosIpadosPanel/IosIpadosPanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import InputField from "components/forms/fields/InputField";
99

1010
const generateUrl = (serverUrl: string, enrollSecret: string) => {
1111
return `${serverUrl}/enroll?enroll_secret=${encodeURIComponent(
12-
enrollSecret
12+
enrollSecret,
1313
)}`;
1414
};
1515

@@ -46,7 +46,7 @@ const IosIpadosPanel = ({ enrollSecret }: IosIpadosPanelProps) => {
4646
return (
4747
<div className={baseClass}>
4848
<InputField
49-
label="Send this to your end users:"
49+
label="Enrollment instructions:"
5050
enableCopy
5151
readOnly
5252
inputWrapperClass={`${baseClass}__enroll-link`}

0 commit comments

Comments
 (0)