rebase updates

FortAwesome · Jul 10, 2023 · d458f1f · d458f1f
1 parent 2bee0ea
commit d458f1f
Showing 1 changed file with 0 additions and 55 deletions.
diff --git a/src/components/__tests__/FontAwesomeIcon.test.js b/src/components/__tests__/FontAwesomeIcon.test.js
@@ -349,17 +349,8 @@ describe('mask', () => {
   test('will add icon', () => {
     const wrapper = mountFromProps({ icon: faCoffee, mask: faCircle })
 
-<<<<<<< HEAD
-    expect(wrapper.element.innerHTML).toMatch(/clipPath/);
-  });
-<<<<<<< HEAD
-});
-
-=======
-=======
     expect(wrapper.element.innerHTML).toMatch(/clipPath/)
   })
->>>>>>> c8895c0 (prettier fixes)
 
   test('will add icon referencing library', () => {
     const wrapper = mountFromProps({
@@ -371,16 +362,9 @@ describe('mask', () => {
   })
 })
 
-<<<<<<< HEAD
->>>>>>> 3072263 (add tests checking for title prop)
-describe("symbol", () => {
-  test("will not create a symbol", () => {
-    const wrapper = mountFromProps({ icon: faCoffee });
-=======
 describe('symbol', () => {
   test('will not create a symbol', () => {
     const wrapper = mountFromProps({ icon: faCoffee })
->>>>>>> c8895c0 (prettier fixes)
 
     expect(wrapper.element.style.getPropertyValue('display')).toBe('')
   })
@@ -510,42 +494,3 @@ if (coreHasFeature(ICON_ALIASES)) {
     expect(wrapper.element.classList.contains('fa-xmark')).toBeTruthy()
   })
 }
-
-describe("using a family", () => {
-  if (coreHasFeature(REFERENCE_ICON_USING_FAMILY)) {
-    test("will find a sharp solid icon using array format, short prefix, and short icon name", () => {
-      const wrapper = mountFromProps({ icon: ["fass", "dog"] });
-
-      expect(wrapper.element.tagName).toBe("svg");
-      expect(wrapper.element.classList.contains("fa-dog")).toBeTruthy();
-    });
-
-    test("will find a sharp solid icon using array format, short prefix, and long fa-icon name", () => {
-      const wrapper = mountFromProps({ icon: ["fass", "fa-dog"] });
-
-      expect(wrapper.element.tagName).toBe("svg");
-      expect(wrapper.element.classList.contains("fa-dog")).toBeTruthy();
-    });
-
-    test("will find a sharp solid icon using string format, short prefix, and long fa-icon name", () => {
-      const wrapper = mountFromProps({ icon: "fass fa-dog" });
-
-      expect(wrapper.element.tagName).toBe("svg");
-      expect(wrapper.element.classList.contains("fa-dog")).toBeTruthy();
-    });
-
-    test("will default to a sharp solid icon using string format, long prefix, and long fa-icon name", () => {
-      const wrapper = mountFromProps({ icon: "fa-sharp fa-dog" });
-
-      expect(wrapper.element.tagName).toBe("svg");
-      expect(wrapper.element.classList.contains("fa-dog")).toBeTruthy();
-    });
-
-    test("will find a sharp solid icon using string format, long prefix, long style, and long fa-icon name", () => {
-      const wrapper = mountFromProps({ icon: "fa-sharp fa-solid fa-dog" });
-
-      expect(wrapper.element.tagName).toBe("svg");
-      expect(wrapper.element.classList.contains("fa-dog")).toBeTruthy();
-    });
-  }
-});