From 4b0833d44e5ebccc9b7af1293db23d6066e3c192 Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 15 Oct 2016 10:31:23 -0700 Subject: [PATCH] Rename fromValue to of; --- README.md | 2 +- doc/README.md | 8 ++++---- examples/simple.lua | 2 +- rx.lua | 13 +++++++++---- src/observable.lua | 13 +++++++++---- tests/all.lua | 4 ++-- tests/buffer.lua | 2 +- tests/combineLatest.lua | 6 +++--- tests/compact.lua | 2 +- tests/concat.lua | 2 +- tests/distinct.lua | 2 +- tests/distinctUntilChanged.lua | 6 +++--- tests/elementAt.lua | 8 ++++---- tests/filter.lua | 4 ++-- tests/find.lua | 4 ++-- tests/first.lua | 2 +- tests/flatMap.lua | 2 +- tests/flatten.lua | 2 +- tests/last.lua | 2 +- tests/map.lua | 2 +- tests/max.lua | 4 ++-- tests/min.lua | 4 ++-- tests/observable.lua | 21 +++++++++++++-------- tests/pack.lua | 2 +- tests/partition.lua | 2 +- tests/pluck.lua | 4 ++-- tests/reduce.lua | 4 ++-- tests/reject.lua | 2 +- tests/scan.lua | 4 ++-- tests/skip.lua | 4 ++-- tests/skipUntil.lua | 6 +++--- tests/skipWhile.lua | 2 +- tests/take.lua | 8 ++++---- tests/takeUntil.lua | 6 +++--- tests/takeWhile.lua | 2 +- tests/tap.lua | 4 ++-- tests/unpack.lua | 4 ++-- tests/unwrap.lua | 2 +- tests/window.lua | 2 +- 39 files changed, 95 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 1e0168f..73e5747 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ local Rx = require 'rx' Rx.Observable.fromRange(1, 8) :filter(function(x) return x % 2 == 0 end) - :concat(Rx.Observable.fromValue('who do we appreciate')) + :concat(Rx.Observable.of('who do we appreciate')) :map(function(value) return value .. '!' end) :subscribe(print) diff --git a/doc/README.md b/doc/README.md index 1966afb..791cdfb 100644 --- a/doc/README.md +++ b/doc/README.md @@ -15,7 +15,7 @@ RxLua - [empty](#empty) - [never](#never) - [throw](#throwmessage) - - [fromValue](#fromvaluevalue) + - [of](#ofvalues) - [fromRange](#fromrangeinitial-limit-step) - [fromTable](#fromtabletable-iterator-keys) - [fromCoroutine](#fromcoroutinecoroutine) @@ -215,13 +215,13 @@ Returns an Observable that immediately produces an error. --- -#### `.fromValue(value)` +#### `.of(values)` -Creates an Observable that produces a single value. +Creates an Observable that produces a set of values. | Name | Type | Default | Description | |------|------|---------|-------------| -| `value` | * | | | +| `values` | *... | | | --- diff --git a/examples/simple.lua b/examples/simple.lua index 29d98fd..7b94432 100644 --- a/examples/simple.lua +++ b/examples/simple.lua @@ -1,4 +1,4 @@ local Rx = require 'rx' -- Create an observable that produces a single value and print it. -Rx.Observable.fromValue(42):subscribe(print) +Rx.Observable.of(42):subscribe(print) diff --git a/rx.lua b/rx.lua index 1df2dbe..18c20af 100644 --- a/rx.lua +++ b/rx.lua @@ -143,12 +143,17 @@ function Observable.throw(message) end) end ---- Creates an Observable that produces a single value. --- @arg {*} value +--- Creates an Observable that produces a set of values. +-- @arg {*...} values -- @returns {Observable} -function Observable.fromValue(value) +function Observable.of(...) + local args = {...} + local argCount = select('#', ...) return Observable.create(function(observer) - observer:onNext(value) + for i = 1, argCount do + observer:onNext(args[i]) + end + observer:onCompleted() end) end diff --git a/src/observable.lua b/src/observable.lua index a024d2b..b563b02 100644 --- a/src/observable.lua +++ b/src/observable.lua @@ -48,12 +48,17 @@ function Observable.throw(message) end) end ---- Creates an Observable that produces a single value. --- @arg {*} value +--- Creates an Observable that produces a set of values. +-- @arg {*...} values -- @returns {Observable} -function Observable.fromValue(value) +function Observable.of(...) + local args = {...} + local argCount = select('#', ...) return Observable.create(function(observer) - observer:onNext(value) + for i = 1, argCount do + observer:onNext(args[i]) + end + observer:onCompleted() end) end diff --git a/tests/all.lua b/tests/all.lua index 32e9115..fc648b5 100644 --- a/tests/all.lua +++ b/tests/all.lua @@ -21,10 +21,10 @@ describe('all', function() end) it('uses the identity function as a predicate if none is specified', function() - local observable = Rx.Observable.fromValue(false):all() + local observable = Rx.Observable.of(false):all() expect(observable).to.produce({{false}}) - observable = Rx.Observable.fromValue(true):all() + observable = Rx.Observable.of(true):all() expect(observable).to.produce({{true}}) end) end) diff --git a/tests/buffer.lua b/tests/buffer.lua index c968acc..9511c38 100644 --- a/tests/buffer.lua +++ b/tests/buffer.lua @@ -1,6 +1,6 @@ describe('buffer', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:buffer().subscribe).to.fail() end) diff --git a/tests/combineLatest.lua b/tests/combineLatest.lua index 02f2c0c..7bcc3ab 100644 --- a/tests/combineLatest.lua +++ b/tests/combineLatest.lua @@ -5,9 +5,9 @@ describe('combineLatest', function() end) it('calls the combinator function with all values produced from all input observables once they have all produced a value', function() - local observableA = Rx.Observable.fromValue('a') - local observableB = Rx.Observable.fromValue('b') - local observableC = Rx.Observable.fromValue('c') + local observableA = Rx.Observable.of('a') + local observableB = Rx.Observable.of('b') + local observableC = Rx.Observable.of('c') local combinator = spy() Rx.Observable.combineLatest(observableA, observableB, observableC, function(...) combinator(...) end):subscribe() expect(combinator).to.equal({{'a', 'b', 'c'}}) diff --git a/tests/compact.lua b/tests/compact.lua index bd1a9f9..b891119 100644 --- a/tests/compact.lua +++ b/tests/compact.lua @@ -1,6 +1,6 @@ describe('compact', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:compact().subscribe).to.fail() end) diff --git a/tests/concat.lua b/tests/concat.lua index 0cbaee3..4b87a3c 100644 --- a/tests/concat.lua +++ b/tests/concat.lua @@ -22,7 +22,7 @@ describe('concat', function() it('should error if any of the sources error', function() local badObservable = Rx.Observable.create(function(observer) observer:onError('oh no') end) - local observable = Rx.Observable.fromValue(1):concat(Rx.Observable.fromValue(2), badObservable) + local observable = Rx.Observable.of(1):concat(Rx.Observable.of(2), badObservable) expect(observable.subscribe).to.fail() end) diff --git a/tests/distinct.lua b/tests/distinct.lua index 200f940..62c0ab8 100644 --- a/tests/distinct.lua +++ b/tests/distinct.lua @@ -5,7 +5,7 @@ describe('distinct', function() end) it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:distinct().subscribe).to.fail() end) diff --git a/tests/distinctUntilChanged.lua b/tests/distinctUntilChanged.lua index 5ba518e..482cc93 100644 --- a/tests/distinctUntilChanged.lua +++ b/tests/distinctUntilChanged.lua @@ -1,6 +1,6 @@ describe('distinctUntilChanged', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:distinctUntilChanged().subscribe).to.fail() end) @@ -12,7 +12,7 @@ describe('distinctUntilChanged', function() end) it('produces the first value if it is nil', function() - local observable = Rx.Observable.fromValue(nil):distinctUntilChanged() + local observable = Rx.Observable.of(nil):distinctUntilChanged() expect(observable).to.produce({{}}) end) @@ -29,7 +29,7 @@ describe('distinctUntilChanged', function() end) it('produces the first value if it is nil', function() - local observable = Rx.Observable.fromValue(nil):distinctUntilChanged(function(x, y) return true end) + local observable = Rx.Observable.of(nil):distinctUntilChanged(function(x, y) return true end) expect(observable).to.produce({{}}) end) diff --git a/tests/elementAt.lua b/tests/elementAt.lua index f6e8506..cea5345 100644 --- a/tests/elementAt.lua +++ b/tests/elementAt.lua @@ -11,16 +11,16 @@ describe('elementAt', function() end) it('errors if no index is specified', function() - expect(Rx.Observable.fromValue(1):elementAt().subscribe).to.fail() + expect(Rx.Observable.of(1):elementAt().subscribe).to.fail() end) it('produces no values if the specified index is less than one', function() - expect(Rx.Observable.fromValue(1):elementAt(0)).to.produce.nothing() - expect(Rx.Observable.fromValue(1):elementAt(-1)).to.produce.nothing() + expect(Rx.Observable.of(1):elementAt(0)).to.produce.nothing() + expect(Rx.Observable.of(1):elementAt(-1)).to.produce.nothing() end) it('produces no values if the specified index is greater than the number of elements produced by the source', function() - expect(Rx.Observable.fromValue(1):elementAt(2)).to.produce.nothing() + expect(Rx.Observable.of(1):elementAt(2)).to.produce.nothing() end) it('produces all values produced by the source at the specified index', function() diff --git a/tests/filter.lua b/tests/filter.lua index 2828bd9..ecd6707 100644 --- a/tests/filter.lua +++ b/tests/filter.lua @@ -17,14 +17,14 @@ describe('filter', function() end) it('errors when its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:filter().subscribe).to.fail() end) it('calls onError if the predicate errors', function() local onError = spy() - Rx.Observable.fromValue(5):filter(error):subscribe(nil, onError, nil) + Rx.Observable.of(5):filter(error):subscribe(nil, onError, nil) expect(#onError).to.equal(1) end) end) diff --git a/tests/find.lua b/tests/find.lua index 02779ab..7f5bc3f 100644 --- a/tests/find.lua +++ b/tests/find.lua @@ -1,13 +1,13 @@ describe('find', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:find().subscribe).to.fail() end) it('calls onError if the predicate errors', function() local onError = spy() - Rx.Observable.fromValue(3):find(error):subscribe(nil, onError, nil) + Rx.Observable.of(3):find(error):subscribe(nil, onError, nil) expect(#onError).to.equal(1) end) diff --git a/tests/first.lua b/tests/first.lua index d77369f..6c79346 100644 --- a/tests/first.lua +++ b/tests/first.lua @@ -1,6 +1,6 @@ describe('first', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:first().subscribe).to.fail() end) diff --git a/tests/flatMap.lua b/tests/flatMap.lua index bb3f0c4..d00d00e 100644 --- a/tests/flatMap.lua +++ b/tests/flatMap.lua @@ -1,6 +1,6 @@ describe('flatMap', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):flatMap(function(x) return x() end) + local observable = Rx.Observable.of(''):flatMap(function(x) return x() end) expect(observable.subscribe).to.fail() end) diff --git a/tests/flatten.lua b/tests/flatten.lua index c4a2e92..efdc6c1 100644 --- a/tests/flatten.lua +++ b/tests/flatten.lua @@ -1,6 +1,6 @@ describe('flatten', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:flatten().subscribe).to.fail() end) diff --git a/tests/last.lua b/tests/last.lua index 49053dc..26f0937 100644 --- a/tests/last.lua +++ b/tests/last.lua @@ -1,6 +1,6 @@ describe('last', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:last().subscribe).to.fail() end) diff --git a/tests/map.lua b/tests/map.lua index 176c409..092e59c 100644 --- a/tests/map.lua +++ b/tests/map.lua @@ -1,6 +1,6 @@ describe('map', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:map().subscribe).to.fail() end) diff --git a/tests/max.lua b/tests/max.lua index 5f331f3..0502789 100644 --- a/tests/max.lua +++ b/tests/max.lua @@ -1,12 +1,12 @@ describe('max', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:max().subscribe).to.fail() end) it('produces an error if one of the values produced is a string', function() - local observable = Rx.Observable.fromValue('string'):max() + local observable = Rx.Observable.of('string'):max() expect(observable.subscribe).to.fail() end) diff --git a/tests/min.lua b/tests/min.lua index ba78c34..7696c02 100644 --- a/tests/min.lua +++ b/tests/min.lua @@ -1,12 +1,12 @@ describe('min', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:min().subscribe).to.fail() end) it('produces an error if one of the values produced is a string', function() - local observable = Rx.Observable.fromValue('string'):min() + local observable = Rx.Observable.of('string'):min() expect(observable.subscribe).to.fail() end) diff --git a/tests/observable.lua b/tests/observable.lua index 7e17c43..7cfcedf 100644 --- a/tests/observable.lua +++ b/tests/observable.lua @@ -14,14 +14,14 @@ describe('Observable', function() describe('subscribe', function() it('passes the first argument to _subscribe if it is a table', function() - local observable = Rx.Observable.fromValue() + local observable = Rx.Observable.of() local observer = Rx.Observer.create() local function run() observable:subscribe(observer) end expect(spy(observable, '_subscribe', run)).to.equal({{observer}}) end) it('creates a new Observer using the first three arguments and passes it to _subscribe if the first argument is not a table', function() - local observable = Rx.Observable.fromValue() + local observable = Rx.Observable.of() local a, b, c = function() end, function() end, function() end local function run() observable:subscribe(a, b, c) end local observer = spy(observable, '_subscribe', run)[1][1] @@ -59,16 +59,21 @@ describe('Observable', function() end) end) - describe('fromValue', function() - it('returns an Observable that produces the first argument and completes', function() - local observable = Rx.Observable.fromValue(1, 2, 3) - expect(observable).to.produce(1) + describe('of', function() + it('returns an Observable that produces the supplied arguments and completes', function() + local observable = Rx.Observable.of(1, 2, 3) + expect(observable).to.produce(1, 2, 3) end) - it('returns an Observable that produces nil and completes if no arguments are passed', function() - local observable = Rx.Observable.fromValue() + it('returns an Observable that produces nil and completes if nil is passed', function() + local observable = Rx.Observable.of(nil) expect(observable).to.produce(nil) end) + + it('returns an Observable that produces nothing if no arguments are passed', function() + local observable = Rx.Observable.of() + expect(observable).to.produce.nothing() + end) end) describe('fromRange', function() diff --git a/tests/pack.lua b/tests/pack.lua index 920ac62..336e49d 100644 --- a/tests/pack.lua +++ b/tests/pack.lua @@ -1,6 +1,6 @@ describe('pack', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:pack().subscribe).to.fail() end) diff --git a/tests/partition.lua b/tests/partition.lua index d65842f..5a00f54 100644 --- a/tests/partition.lua +++ b/tests/partition.lua @@ -1,6 +1,6 @@ describe('partition', function() it('errors when its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:partition().subscribe).to.fail() end) diff --git a/tests/pluck.lua b/tests/pluck.lua index 41714f8..dcde6d4 100644 --- a/tests/pluck.lua +++ b/tests/pluck.lua @@ -1,6 +1,6 @@ describe('pluck', function() it('returns the original observable if no key is specified', function() - local observable = Rx.Observable.fromValue(7) + local observable = Rx.Observable.of(7) expect(observable:pluck()).to.equal(observable) end) @@ -33,6 +33,6 @@ describe('pluck', function() it('respects metatables', function() local t = setmetatable({}, {__index = {a = 'b'}}) - expect(Rx.Observable.fromValue(t):pluck('a')).to.produce('b') + expect(Rx.Observable.of(t):pluck('a')).to.produce('b') end) end) diff --git a/tests/reduce.lua b/tests/reduce.lua index c9dbdac..9a7cbf7 100644 --- a/tests/reduce.lua +++ b/tests/reduce.lua @@ -1,6 +1,6 @@ describe('reduce', function() it('fails if the first argument is not a function', function() - local observable = Rx.Observable.fromValue(0) + local observable = Rx.Observable.of(0) expect(observable:reduce()).to.fail() expect(observable:reduce(1)).to.fail() expect(observable:reduce('')).to.fail() @@ -10,7 +10,7 @@ describe('reduce', function() it('uses the seed as the initial value to the accumulator', function() local accumulator = spy() - Rx.Observable.fromValue(3):reduce(accumulator, 4):subscribe() + Rx.Observable.of(3):reduce(accumulator, 4):subscribe() expect(accumulator[1]).to.equal({4, 3}) end) diff --git a/tests/reject.lua b/tests/reject.lua index f92cf9f..1cfb8fa 100644 --- a/tests/reject.lua +++ b/tests/reject.lua @@ -17,7 +17,7 @@ describe('reject', function() end) it('errors when its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:reject().subscribe).to.fail() end) diff --git a/tests/scan.lua b/tests/scan.lua index 498e1fb..e1c3864 100644 --- a/tests/scan.lua +++ b/tests/scan.lua @@ -1,6 +1,6 @@ describe('scan', function() it('fails if the first argument is not a function', function() - local observable = Rx.Observable.fromValue(0) + local observable = Rx.Observable.of(0) expect(observable:scan()).to.fail() expect(observable:scan(1)).to.fail() expect(observable:scan('')).to.fail() @@ -10,7 +10,7 @@ describe('scan', function() it('uses the seed as the initial value to the accumulator', function() local accumulator = spy() - Rx.Observable.fromValue(3):scan(accumulator, 4):subscribe() + Rx.Observable.of(3):scan(accumulator, 4):subscribe() expect(accumulator[1]).to.equal({4, 3}) end) diff --git a/tests/skip.lua b/tests/skip.lua index dfa238b..105a9c2 100644 --- a/tests/skip.lua +++ b/tests/skip.lua @@ -1,6 +1,6 @@ describe('skip', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:skip(1).subscribe).to.fail() end) @@ -26,7 +26,7 @@ describe('skip', function() end) it('completes and does not fail if it skips over more values than were produced', function() - local observable = Rx.Observable.fromValue(3):skip(5) + local observable = Rx.Observable.of(3):skip(5) local onNext, onError, onCompleted = observableSpy(observable) expect(#onNext).to.equal(0) expect(#onError).to.equal(0) diff --git a/tests/skipUntil.lua b/tests/skipUntil.lua index 3571097..a5f58aa 100644 --- a/tests/skipUntil.lua +++ b/tests/skipUntil.lua @@ -1,12 +1,12 @@ describe('skipUntil', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:skipUntil(1).subscribe).to.fail() end) it('fails if the first argument is not an Observable', function() - local observable = Rx.Observable.fromValue(3) + local observable = Rx.Observable.of(3) expect(observable:skipUntil(nil)).to.fail() expect(observable:skipUntil(0)).to.fail() expect(observable:skipUntil({})).to.fail() @@ -38,7 +38,7 @@ describe('skipUntil', function() it('produces all values if the specified observable fires immediately', function() local onNext = spy() local subject = Rx.Subject.create() - subject:skipUntil(Rx.Observable.fromValue(1)):subscribe(Rx.Observer.create(onNext)) + subject:skipUntil(Rx.Observable.of(1)):subscribe(Rx.Observer.create(onNext)) subject:onNext(1) subject:onNext(2) subject:onNext(3) diff --git a/tests/skipWhile.lua b/tests/skipWhile.lua index b5e5831..1bf5d60 100644 --- a/tests/skipWhile.lua +++ b/tests/skipWhile.lua @@ -1,6 +1,6 @@ describe('skipWhile', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:skipWhile(function() end).subscribe).to.fail() end) diff --git a/tests/take.lua b/tests/take.lua index b3c3d89..7a573c5 100644 --- a/tests/take.lua +++ b/tests/take.lua @@ -1,17 +1,17 @@ describe('take', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:take(1).subscribe).to.fail() end) it('produces nothing if the count is zero', function() - local observable = Rx.Observable.fromValue(3):take(0) + local observable = Rx.Observable.of(3):take(0) expect(observable).to.produce.nothing() end) it('produces nothing if the count is less than zero', function() - local observable = Rx.Observable.fromValue(3):take(-3) + local observable = Rx.Observable.of(3):take(-3) expect(observable).to.produce.nothing() end) @@ -26,7 +26,7 @@ describe('take', function() end) it('completes and does not fail if it takes more values than were produced', function() - local observable = Rx.Observable.fromValue(3):take(5) + local observable = Rx.Observable.of(3):take(5) local onNext, onError, onCompleted = observableSpy(observable) expect(onNext).to.equal({{3}}) expect(#onError).to.equal(0) diff --git a/tests/takeUntil.lua b/tests/takeUntil.lua index eb03bae..fb953d8 100644 --- a/tests/takeUntil.lua +++ b/tests/takeUntil.lua @@ -1,12 +1,12 @@ describe('takeUntil', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:takeUntil().subscribe).to.fail() end) it('fails if the first argument is not an Observable', function() - local observable = Rx.Observable.fromValue(3) + local observable = Rx.Observable.of(3) expect(observable:takeUntil(nil)).to.fail() expect(observable:takeUntil(0)).to.fail() expect(observable:takeUntil({})).to.fail() @@ -35,7 +35,7 @@ describe('takeUntil', function() it('produces no values if the specified observable fires immediately', function() local onNext = spy() local subject = Rx.Subject.create() - subject:takeUntil(Rx.Observable.fromValue(1)):subscribe(Rx.Observer.create(onNext)) + subject:takeUntil(Rx.Observable.of(1)):subscribe(Rx.Observer.create(onNext)) subject:onNext(1) subject:onNext(2) subject:onNext(3) diff --git a/tests/takeWhile.lua b/tests/takeWhile.lua index 43dc2a9..1328890 100644 --- a/tests/takeWhile.lua +++ b/tests/takeWhile.lua @@ -1,6 +1,6 @@ describe('takeWhile', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:takeWhile(function() end).subscribe).to.fail() end) diff --git a/tests/tap.lua b/tests/tap.lua index a9a2322..617d04f 100644 --- a/tests/tap.lua +++ b/tests/tap.lua @@ -17,7 +17,7 @@ describe('tap', function() local onNext = spy() local onError = spy() local observer = Rx.Observer.create(onNext, onError) - Rx.Observable.fromValue(1):tap(error):subscribe(observer) + Rx.Observable.of(1):tap(error):subscribe(observer) expect(#onNext).to.equal(0) expect(#onError).to.equal(1) end) @@ -47,7 +47,7 @@ describe('tap', function() it('calls onError if the onCompleted callback errors', function() local onError = spy() local onCompleted = spy() - Rx.Observable.fromValue(1):tap(nil, nil, error):subscribe(nil, onError, onCompleted) + Rx.Observable.of(1):tap(nil, nil, error):subscribe(nil, onError, onCompleted) expect(#onCompleted).to.equal(0) expect(#onError).to.equal(1) end) diff --git a/tests/unpack.lua b/tests/unpack.lua index 9b4159e..4192ddb 100644 --- a/tests/unpack.lua +++ b/tests/unpack.lua @@ -1,12 +1,12 @@ describe('unpack', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:unpack().subscribe).to.fail() end) it('fails if the observable produces an element that is not a table', function() - expect(Rx.Observable.fromValue(3):unpack().subscribe).to.fail() + expect(Rx.Observable.of(3):unpack().subscribe).to.fail() end) it('produces all elements in the tables produced as multiple values', function() diff --git a/tests/unwrap.lua b/tests/unwrap.lua index 894e4d2..f115ca7 100644 --- a/tests/unwrap.lua +++ b/tests/unwrap.lua @@ -1,6 +1,6 @@ describe('unwrap', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:unwrap().subscribe).to.fail() end) diff --git a/tests/window.lua b/tests/window.lua index e6b304d..0e09f0f 100644 --- a/tests/window.lua +++ b/tests/window.lua @@ -1,6 +1,6 @@ describe('window', function() it('produces an error if its parent errors', function() - local observable = Rx.Observable.fromValue(''):map(function(x) return x() end) + local observable = Rx.Observable.of(''):map(function(x) return x() end) expect(observable.subscribe).to.fail() expect(observable:window().subscribe).to.fail() end)