Skip to content

Commit 948f62a

Browse files
authored
Merge pull request #2 from madetech/TheBranchThatShallNotBeNames
Removing references to... something.
2 parents c49d53e + 005c063 commit 948f62a

File tree

4 files changed

+6
-29
lines changed

4 files changed

+6
-29
lines changed

src/models/CattleFactory.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export class CattleFactory {
1818
formData.breed,
1919
formData.location,
2020
formData.status || 'Healthy',
21-
formData.semenQuality || 'Good',
2221
formData.imageUrl || null
2322
);
2423
} else if (sex === 'Female') {

src/models/MaleCattle.js

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,13 @@
11
import { Cattle } from './Cattle';
22

33
export class MaleCattle extends Cattle {
4-
#semenQuality;
5-
6-
constructor(id, tag, breed, location, status = 'Healthy', semenQuality = 'Good', imageUrl = null) {
4+
constructor(id, tag, breed, location, status = 'Healthy', imageUrl = null) {
75
super(id, 'Male', tag, breed, location, status, imageUrl);
8-
this.#semenQuality = semenQuality;
9-
}
10-
11-
// Getter
12-
get semenQuality() { return this.#semenQuality; }
13-
14-
// Setter with validation
15-
set semenQuality(newQuality) {
16-
if (!newQuality) {
17-
throw new Error('Semen quality cannot be empty');
18-
}
19-
this.#semenQuality = newQuality;
206
}
217

228
toJSON() {
239
return {
24-
...super.toJSON(),
25-
semenQuality: this.#semenQuality
10+
...super.toJSON()
2611
};
2712
}
2813
}

src/models/__tests__/Cattle.test.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('Cattle', () => {
3030

3131
describe('MaleCattle', () => {
3232
test('creates a male cattle instance with all properties', () => {
33-
const cattle = new MaleCattle(1, 'COW001', 'Angus', 'North Pasture', 'Healthy', 'Good', 'image.jpg');
33+
const cattle = new MaleCattle(1, 'COW001', 'Angus', 'North Pasture', 'Healthy', 'image.jpg');
3434

3535
expect(cattle.id).toBe(1);
3636
expect(cattle.tag).toBe('COW001');
@@ -39,7 +39,6 @@ describe('MaleCattle', () => {
3939
expect(cattle.status).toBe('Healthy');
4040
expect(cattle.imageUrl).toBe('image.jpg');
4141
expect(cattle.sex).toBe('Male');
42-
expect(cattle.semenQuality).toBe('Good');
4342
});
4443

4544
test('creates a male cattle from form data', () => {
@@ -48,8 +47,7 @@ describe('MaleCattle', () => {
4847
tag: 'COW001',
4948
breed: 'Angus',
5049
location: 'North Pasture',
51-
status: 'Healthy',
52-
semenQuality: 'Good'
50+
status: 'Healthy'
5351
};
5452

5553
const cattle = CattleFactory.createFromFormData(formData);
@@ -59,16 +57,14 @@ describe('MaleCattle', () => {
5957
expect(cattle.location).toBe('North Pasture');
6058
expect(cattle.status).toBe('Healthy');
6159
expect(cattle.sex).toBe('Male');
62-
expect(cattle.semenQuality).toBe('Good');
6360
});
6461

6562
test('creates a male cattle from form data with default status', () => {
6663
const formData = {
6764
sex: 'Male',
6865
tag: 'COW001',
6966
breed: 'Angus',
70-
location: 'North Pasture',
71-
semenQuality: 'Good'
67+
location: 'North Pasture'
7268
};
7369

7470
const cattle = CattleFactory.createFromFormData(formData);

src/models/__tests__/CattleFactory.test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ describe('CattleFactory', () => {
77
tag: 'COW001',
88
breed: 'Angus',
99
location: 'North Pasture',
10-
status: 'Healthy',
11-
semenQuality: 'Good'
10+
status: 'Healthy'
1211
};
1312

1413
const cattle = CattleFactory.createFromFormData(formData);
@@ -18,7 +17,6 @@ describe('CattleFactory', () => {
1817
expect(cattle.breed).toBe('Angus');
1918
expect(cattle.location).toBe('North Pasture');
2019
expect(cattle.status).toBe('Healthy');
21-
expect(cattle.semenQuality).toBe('Good');
2220
});
2321

2422
test('creates female cattle from form data', () => {
@@ -59,7 +57,6 @@ describe('CattleFactory', () => {
5957
expect(cattle[0].breed).toBe('Angus');
6058
expect(cattle[0].location).toBe('North Pasture');
6159
expect(cattle[0].status).toBe('Healthy');
62-
expect(cattle[0].semenQuality).toBe('Good');
6360

6461
// Check first female cattle
6562
expect(cattle[5].tag).toBe('F001');

0 commit comments

Comments
 (0)