Skip to content

Commit

Permalink
Convert 'last' from non-blocking to blocking to match Rx.Net
Browse files Browse the repository at this point in the history
See ReactiveX/RxJava#57 (comment) for background.

NOTE: This is a breaking change thus we are bumping the version from 0.5.x to 0.6.x

Manual merge of branch 'last' of git://github.com/mairbek/RxJava into issue-57-last

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java
  • Loading branch information
benjchristensen committed Mar 12, 2013
2 parents c2b8b09 + 1663a98 commit 01f61df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/rx/lang/jruby/JRubyAdaptor.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void testFilterViaGroovy() {

@Test
public void testLast() {
String script = "mockApiCall.getObservable().last().subscribe(lambda{|result| a.received(result)})";
String script = "mockApiCall.getObservable().takeLast(1).subscribe(lambda{|result| a.received(result)})";
runGroovyScript(script);
verify(assertion, times(1)).received("hello_1");
}
Expand Down

0 comments on commit 01f61df

Please sign in to comment.