Skip to content
This repository was archived by the owner on Apr 20, 2018. It is now read-only.

Commit 8f069d1

Browse files
committed
Docs/testing cleanup
This fixes a variety of inconsistencies/broken code in documentation and testing examples.
1 parent 8ecda98 commit 8f069d1

11 files changed

Lines changed: 20 additions & 36 deletions

File tree

doc/api/core/operators/buffer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Returns an Observable that emits buffers of items it collects from the source `O
2626
```js
2727
// With closings
2828
var source = Rx.Observable.timer(0, 50)
29-
.window(function () { return Rx.Observable.timer(125); })
29+
.buffer(function () { return Rx.Observable.timer(125); })
3030
.take(3);
3131

3232
var subscription = source.subscribe(
@@ -42,7 +42,7 @@ var subscription = source.subscribe(
4242

4343
// => Next: 0,1,2
4444
// => Next: 3,4,5
45-
// => Next: 6,7,8
45+
// => Next: 6,7
4646
// => Completed
4747
```
4848

doc/api/core/operators/window.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var subscription = source.subscribe(
4242

4343
// => Next: 0,1,2
4444
// => Next: 3,4,5
45-
// => Next: 6,7,8
45+
// => Next: 6,7
4646
// => Completed
4747
```
4848

doc/api/testing/testscheduler.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function createMessage(expected, actual) {
1414
// Using QUnit testing for assertions
1515
var collectionAssert = {
1616
assertEqual: function (expected, actual) {
17-
var comparer = Rx.Internals.isEqual, isOk = true;
17+
var comparer = Rx.internals.isEqual, isOk = true;
1818

1919
if (expected.length !== actual.length) {
2020
ok(false, 'Not equal length. Expected: ' + expected.length + ' Actual: ' + actual.length);
@@ -95,7 +95,8 @@ Creates a new virtual time test scheduler.
9595
#### Example
9696
```js
9797
var onNext = Rx.ReactiveTest.onNext,
98-
onCompleted = Rx.ReactiveTest.onCompleted;
98+
onCompleted = Rx.ReactiveTest.onCompleted,
99+
subscribe = Rx.ReactiveTest.subscribe;
99100

100101
var scheduler = new Rx.TestScheduler();
101102

doc/gettingstarted/operators.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For example, let's see how we might implement the [_.where](http://lodash.com/do
1111
```js
1212
Rx.Observable.prototype.whereProperties = function (properties) {
1313
var source = this,
14-
comparer = Rx.Internals.equals;
14+
comparer = Rx.internals.isEqual;
1515

1616
return Rx.Observable.filterByProperties(function (observer) {
1717
// Our disposable is the subscription from the parent
@@ -55,7 +55,7 @@ We could rewrite it as the following to take advantage of already built in opera
5555

5656
```js
5757
Rx.Observable.prototype.filterByProperties = function (properties) {
58-
var comparer = Rx.Internals.equals;
58+
var comparer = Rx.internals.isEqual;
5959

6060
return this.filter(function (data) {
6161

doc/gettingstarted/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function createMessage(actual, expected) {
2020
// Using QUnit testing for assertions
2121
var collectionAssert = {
2222
assertEqual: function (expected, actual) {
23-
var comparer = Rx.Internals.isEqual,
23+
var comparer = Rx.internals.isEqual,
2424
isOk = true;
2525

2626
if (expected.length !== actual.length) {

examples/testing/jasmine/SpecRunner.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<script type="text/javascript" src="lib/jasmine-1.3.1/jasmine-html.js"></script>
1111

1212
<!-- include source files here... -->
13-
<script type="text/javascript" src="../../../rx.js"></script>
14-
<script type="text/javascript" src="../../../rx.virtualtime.js"></script>
15-
<script type="text/javascript" src="../../../rx.time.js"></script>
16-
<script type="text/javascript" src="../../../rx.testing.js"></script>
13+
<script type="text/javascript" src="../../../dist/rx.js"></script>
14+
<script type="text/javascript" src="../../../dist/rx.virtualtime.js"></script>
15+
<script type="text/javascript" src="../../../dist/rx.time.js"></script>
16+
<script type="text/javascript" src="../../../dist/rx.testing.js"></script>
1717

1818
<!-- include spec files here... -->
1919
<script type="text/javascript" src="spec/SpecHelper.js"></script>

examples/testing/jasmine/spec/SpecHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var slice = Array.prototype.slice;
22

33
function areElementsEqual(expected, actual, comparer) {
44
var i, isOk = true;
5-
comparer || (comparer = Rx.Internals.isEqual);
5+
comparer || (comparer = Rx.internals.isEqual);
66
if (expected.length !== actual.length) {
77
return false;
88
}

examples/testing/nodejs/collectionassert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function createMessage(actual, expected) {
88
var collectionAssert = {
99
/* Assertion for collections of notification messages */
1010
assertEqual: function (expected, actual, comparer, message) {
11-
comparer || (comparer = Rx.Internals.isEqual);
11+
comparer || (comparer = Rx.internals.isEqual);
1212
var isOk = true, i, len;
1313

1414
if (expected.length !== actual.length) {

examples/testing/qunit/customassertions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
root.CollectionAssert = {
1111
/* Assertion for collections of notification messages */
1212
assertEqual: function (expected, actual, comparer, message) {
13-
comparer || (comparer = Rx.Internals.isEqual);
13+
comparer || (comparer = Rx.internals.isEqual);
1414
var isOk = true, i, len;
1515

1616
if (expected.length !== actual.length) {

examples/testing/qunit/tests.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<body>
88
<div id="qunit"></div>
99
<script src="qunit.js"></script>
10-
<script src="../../../rx.js"></script>
11-
<script src="../../../rx.virtualtime.js"></script>
12-
<script src="../../../rx.time.js"></script>
13-
<script src="../../../rx.testing.js"></script>
10+
<script src="../../../dist/rx.js"></script>
11+
<script src="../../../dist/rx.virtualtime.js"></script>
12+
<script src="../../../dist/rx.time.js"></script>
13+
<script src="../../../dist/rx.testing.js"></script>
1414
<script src="customassertions.js"></script>
1515
<script src="tests.js"></script>
1616
</body>

0 commit comments

Comments
 (0)