Skip to content

Commit 66c87fc

Browse files
authored
Merge branch 'master' into removeFromArray-README-update
2 parents 6f30194 + e2f4597 commit 66c87fc

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

fibonacci/fibonacci.spec.js

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ describe('fibonacci', function() {
1919
xit('doesn\'t accept negatives', function() {
2020
expect(fibonacci(-25)).toEqual("OOPS");
2121
});
22+
xit('DOES accept strings', function() {
23+
expect(fibonacci("1")).toEqual(1);
24+
});
25+
xit('DOES accept strings', function() {
26+
expect(fibonacci("2")).toEqual(1);
27+
});
2228
xit('DOES accept strings', function() {
2329
expect(fibonacci("8")).toEqual(21);
2430
});

helloWorld/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Let's look at the spec file first:
1313
const helloWorld = require('./helloWorld');
1414

1515
describe('Hello World', function() {
16-
it('says hello world', function() {
16+
it('says hello world', function() {
1717
expect(helloWorld()).toEqual('Hello, World!');
1818
});
1919
});

removeFromArray/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ the first test on this one is fairly easy, but there are a few things to think a
1212

1313
- how to remove a single element from an array
1414
- how to deal with multiple optional arguments in a javascript function
15-
- [Check this link](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/arguments). Scroll down to the bit about `Array.from` or the spread operator.
15+
- [Check this link](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/arguments). Scroll down to the bit about `Array.from` or the spread operator. - [Or this link](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
16+
17+

reverseString/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Exercise 02 - Reverse a String.
22

3-
Pretty simple, write a function called `reverseString` that returns it's input, reversed!
3+
Pretty simple, write a function called `reverseString` that returns its input, reversed!
44

55
```javascript
66
reverseString('hello there') // returns 'ereht olleh'

0 commit comments

Comments
 (0)