Revert "Resolve merge conflicts"

This reverts commit 61338e0ca0, reversing
changes made to b9983073cc.
This commit is contained in:
Tatiana
2021-05-08 11:27:13 -07:00
parent 18cffeb940
commit b2f2211321
18 changed files with 91 additions and 11174 deletions
-1
View File
@@ -1,3 +1,2 @@
let findTheOldest = function () {};
module.exports = findTheOldest;
+6 -6
View File
@@ -1,7 +1,7 @@
const findTheOldest = require("./findTheOldest");
let findTheOldest = require("./findTheOldest");
describe("findTheOldest", () => {
test("finds the oldest person!", () => {
describe("findTheOldest", function () {
it("finds the oldest person!", function () {
const people = [
{
name: "Carly",
@@ -19,7 +19,7 @@ describe("findTheOldest", () => {
yearOfDeath: 1941,
},
];
expect(findTheOldest(people).name).toBe("Ray");
expect(findTheOldest(people).name).toEqual("Ray");
});
xit("finds the oldest person if someone is still living", function () {
const people = [
@@ -38,7 +38,7 @@ describe("findTheOldest", () => {
yearOfDeath: 1941,
},
];
expect(findTheOldest(people).name).toBe("Ray");
expect(findTheOldest(people).name).toEqual("Ray");
});
xit("finds the oldest person if the OLDEST is still living", function () {
const people = [
@@ -57,6 +57,6 @@ describe("findTheOldest", () => {
yearOfDeath: 1941,
},
];
expect(findTheOldest(people).name).toBe("Carly");
expect(findTheOldest(people).name).toEqual("Carly");
});
});