wip make github first spec actually work

Author: jeffbcross

karma.conf.js

@@ -24,7 +24,6 @@ module.exports = function (config) {
       { pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: true },
       { pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: true },
 
-
       { pattern: 'karma-test-shim.js', included: true, watched: true },
 
       // paths loaded via module imports

src/client/app/github/github.spec.ts

@@ -1,25 +1,35 @@
+declare var jasmine:any;
+declare var expect:any;
 import {
   it,
   iit,
   describe,
   ddescribe,
-  expect,
+  // expect,
   inject,
   injectAsync,
   TestComponentBuilder,
   beforeEachProviders
 } from 'angular2/testing';
 import {provide} from 'angular2/core';
 import {Github} from './github';
+import {HTTP_PROVIDERS, XHRBackend, Response, BaseResponseOptions} from 'angular2/http';
+import {MockBackend, MockConnection} from 'angular2/http/testing';
 
 
 describe('Github Service', () => {
 
-  beforeEachProviders(() => [Github]);
+  beforeEachProviders(() => [Github, HTTP_PROVIDERS, provide(XHRBackend, {useClass: MockBackend})]);
 
 
-  it('should ...', inject([Github], (service: Github) => {
+  it('should make a request to the Github API', inject([Github, XHRBackend], (service: Github, backend: MockBackend) => {
+    console.log('backend', backend);
+    var nextSpy = jasmine.createSpy('next')
+    backend.connections.subscribe(nextSpy);
 
+    var fetchObservable = service.fetch('/repo', 'foo', 'bar=baz');
+    expect(nextSpy).not.toHaveBeenCalled();
+    fetchObservable.subscribe();
+    expect(nextSpy).toHaveBeenCalled();
   }));
-
 });

src/client/app/github/github.ts

@@ -3,6 +3,9 @@ import {Http} from 'angular2/http';
 import {Observable} from 'rxjs/Observable';
 import {ScalarObservable} from 'rxjs/observable/ScalarObservable';
 import {ErrorObservable} from 'rxjs/observable/ErrorObservable';
+import {_catch} from 'rxjs/operator/catch';
+import {map} from 'rxjs/operator/map';
+import {_do} from 'rxjs/operator/do';
 
 import {User, Repo} from './types';
 const GITHUB_API = 'https://api.github.com';
@@ -13,16 +16,15 @@ export class Github {
   constructor(private _http:Http) {}
 
   fetch(path:string, accessToken, params?: string): Observable<Repo> {
-
-    return getCache(path)
-      .catch(() => this._httpRequest(path, accessToken, params));
+    return _catch.call(getCache(path),
+      () => this._httpRequest(path, accessToken, params));
   }
 
   _httpRequest (path:string, accessToken:string, params?:string) {
     var url = `${GITHUB_API}${path}?${params ? params + '&' : ''}access_token=${accessToken}`
-    return this._http.get(url)
-        .do(res => setCache(path, res.text()))
-        .map(res => res.json());
+    var reqObservable = this._http.get(url);
+    var setCacheSideEffect = _do.call(reqObservable, res => setCache(path, res.text()));
+    return map.call(setCacheSideEffect, res => res.json());
   }
 }