-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat(list): Add methods to FirebaseListObservable * feat(list): .remove() should remove the whole list if no param is provided * chore(utils): Add utils for runtime type checking * feat(list): Accept url or ref * chore(utils): function for checking for url or firebase ref * feat(object): Accept a ref for .object() * fix(auth): login() with Password provides credentials * fix(auth): Add expires to FirebaseAuthState * fix(auth): Add PasswordCredentials interface * feat(auth): Add createUser method on auth * fix(auth): Add expires in original declaration * feat(querying) Add Querying API * feat(querying) * lots of fixes to query * feat(querying): Awesome dynamic querying * feat(querying): Tests for querying * chore(querying): Remove commented out code * feat(build): Change build for local typescript * fix(database): Trigger observer error from .on() cancel callback * fix(query): Feedback from jeffbcross * fix(querying): Newline * chore(version): Update to rc * chore(version): Upgrade rxjs to beta 6 * chore(merge): Clean up merge conflics * fix(typings): Provide more specific typings
- Loading branch information
Showing
27 changed files
with
198 additions
and
192 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,88 @@ | ||
| import {BrowserDomAdapter} from 'angular2/platform/browser'; | ||
| BrowserDomAdapter.makeCurrent(); | ||
| /*global jasmine, __karma__, window*/ | ||
| Error.stackTraceLimit = Infinity; | ||
| jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; | ||
|
|
||
| __karma__.loaded = function () { | ||
| }; | ||
|
|
||
|
|
||
| function isJsFile(path) { | ||
| return path.slice(-3) == '.js'; | ||
| } | ||
|
|
||
| function isSpecFile(path) { | ||
| return path.slice(-7) == 'spec.js'; | ||
| } | ||
|
|
||
| function isBuiltFile(path) { | ||
| var builtPath = '/base/dist/'; | ||
| return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath); | ||
| } | ||
|
|
||
| var allSpecFiles = Object.keys(window.__karma__.files) | ||
| .filter(isSpecFile) | ||
| .filter(isBuiltFile); | ||
|
|
||
| // Load our SystemJS configuration. | ||
| System.config({ | ||
| baseURL: '/base' | ||
| }); | ||
|
|
||
| System.config( | ||
| { | ||
| map: { | ||
| 'rxjs': 'node_modules/rxjs', | ||
| '@angular': 'node_modules/@angular', | ||
| firebase: 'node_modules/firebase/lib/firebase-web.js', | ||
| 'app': 'dist' | ||
| }, | ||
| packages: { | ||
| 'app': { | ||
| main: 'main.js', | ||
| defaultExtension: 'js' | ||
| }, | ||
| '@angular/core': { | ||
| main: 'index.js', | ||
| defaultExtension: 'js' | ||
| }, | ||
| '@angular/compiler': { | ||
| main: 'index.js', | ||
| defaultExtension: 'js' | ||
| }, | ||
| '@angular/common': { | ||
| main: 'index.js', | ||
| defaultExtension: 'js' | ||
| }, | ||
| '@angular/platform-browser': { | ||
| main: 'index.js', | ||
| defaultExtension: 'js' | ||
| }, | ||
| '@angular/platform-browser-dynamic': { | ||
| main: 'index.js', | ||
| defaultExtension: 'js' | ||
| }, | ||
| 'rxjs': { | ||
| main: 'Rx.js', | ||
| defaultExtension: 'js' | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| Promise.all([ | ||
| System.import('@angular/core/testing'), | ||
| System.import('@angular/platform-browser-dynamic/testing') | ||
| ]).then(function (providers) { | ||
| var testing = providers[0]; | ||
| var testingBrowser = providers[1]; | ||
|
|
||
| testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, | ||
| testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS); | ||
|
|
||
| }).then(function() { | ||
| // Finally, load all spec files. | ||
| // This will run the tests directly. | ||
| return Promise.all( | ||
| allSpecFiles.map(function (moduleName) { | ||
| return System.import(moduleName); | ||
| })); | ||
| }).then(__karma__.start, __karma__.error); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,128 +1,51 @@ | ||
| // Karma configuration | ||
| // Generated on Wed Jan 20 2016 06:08:48 GMT-0800 (PST) | ||
|
|
||
| module.exports = function(config) { | ||
| config.set({ | ||
|
|
||
| plugins: [ | ||
| require('./tools/test-server'), | ||
| require('karma-jasmine'), | ||
| require('karma-chrome-launcher'), | ||
| require('karma-firefox-launcher'), | ||
| require('karma-systemjs'), | ||
| require('karma-mocha-reporter') | ||
| ], | ||
|
|
||
| systemjs: { | ||
| config: { | ||
| map: { | ||
| rxjs: 'node_modules/rxjs', | ||
| angular2: 'node_modules/angular2', | ||
| 'zone.js': 'node_modules/zone.js/lib', | ||
| firebase: 'node_modules/firebase/lib/firebase-web.js', | ||
| 'mock-promises': 'node_modules/mock-promises/lib/mock-promises.js', | ||
| 'reflect-metadata': 'node_modules/reflect-metadata/temp/Reflect.js', | ||
| }, | ||
| packages: { | ||
| 'traceur': { | ||
| defaultExtension: 'js' | ||
| }, | ||
| 'angular2': { | ||
| defaultExtension: 'js' | ||
| }, | ||
| 'dist': { | ||
| defaultExtension: 'js' | ||
| }, | ||
| 'zone.js': { | ||
| defaultExtension: 'js' | ||
| }, | ||
| 'reflect-metadata': { | ||
| format: 'global' | ||
| }, | ||
| 'rxjs': { | ||
| main: 'Rx.js', | ||
| defaultExtension: 'js' | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| // base path that will be used to resolve all patterns (eg. files, exclude) | ||
| basePath: '', | ||
|
|
||
| frameworks: ['jasmine'], | ||
|
|
||
| // frameworks to use | ||
| // available frameworks: https://npmjs.org/browse/keyword/karma-adapter | ||
| frameworks: ['systemjs', 'jasmine'], | ||
|
|
||
|
|
||
| // list of files / patterns to load in the browser | ||
| files: [ | ||
| 'node_modules/traceur/traceur.+(js|map)', | ||
| {pattern: 'node_modules/systemjs/dist/**/*.map', included: false, watched: false}, | ||
| {pattern: 'node_modules/angular2/**/*.+(js|map)', included: false, watched: false}, | ||
| {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: false, watched: false}, | ||
| {pattern: 'node_modules/reflect-metadata/**/*.+(js|map)', included: false, watched: false}, | ||
| {pattern: 'node_modules/reflect-metadata/temp/Reflect.js', included: true, watched: false}, | ||
| {pattern: 'node_modules/zone.js/lib/**/*.js', included: false, watched: false}, | ||
| 'node_modules/zone.js/lib/zone.js', | ||
| {pattern: 'karma-test-shim.js', included: true, watched: true}, | ||
| {pattern: 'node_modules/rxjs/**/*.+(js|map)', included: false, watched: false}, | ||
| {pattern: 'node_modules/firebase/lib/firebase-web.js', included: false, watched: false}, | ||
| {pattern: 'node_modules/mock-promises/lib/mock-promises.js', included: false, watched: false}, | ||
| {pattern: 'dist/**/*.js', included: false, watched: true}, | ||
| {pattern: 'src/**/*.ts', included: false, watched: false}, | ||
| 'dist/**/*.spec.js', | ||
| 'dist/*.spec.js', | ||
| {pattern: 'dist/**/*.js.map', included: false, watched: false}, | ||
| ], | ||
| // Polyfills. | ||
| 'node_modules/es6-shim/es6-shim.js', | ||
|
|
||
| 'node_modules/reflect-metadata/Reflect.js', | ||
|
|
||
| // list of files to exclude | ||
| exclude: [ | ||
| ], | ||
| // System.js for module loading | ||
| 'node_modules/systemjs/dist/system-polyfills.js', | ||
| 'node_modules/systemjs/dist/system.src.js', | ||
|
|
||
| // Zone.js dependencies | ||
| 'node_modules/zone.js/dist/zone.js', | ||
| 'node_modules/zone.js/dist/jasmine-patch.js', | ||
| 'node_modules/zone.js/dist/async-test.js', | ||
|
|
||
| // preprocess matching files before serving them to the browser | ||
| // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor | ||
| preprocessors: { | ||
| }, | ||
| // RxJs. | ||
| { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, | ||
| { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false }, | ||
|
|
||
|
|
||
| // test results reporter to use | ||
| // possible values: 'dots', 'progress' | ||
| // available reporters: https://npmjs.org/browse/keyword/karma-reporter | ||
| reporters: ['mocha'], | ||
| {pattern: 'karma-test-shim.js', included: true, watched: true}, | ||
| {pattern: 'built/test/matchers.js', included: true, watched: true}, | ||
|
|
||
| // paths loaded via module imports | ||
| // Angular itself | ||
| {pattern: 'node_modules/@angular/**/*.js', included: false, watched: true}, | ||
| {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: true}, | ||
|
|
||
| // web server port | ||
| {pattern: 'node_modules/firebase/lib/firebase-web.js', included: false, watched: false}, | ||
| {pattern: 'node_modules/mock-promises/lib/mock-promises.js', included: false, watched: false}, | ||
| {pattern: 'dist/**/*.js', included: false, watched: true}, | ||
| {pattern: 'dist/**/*.js.map', included: false, watched: false} | ||
| ], | ||
|
|
||
| reporters: ['mocha'], | ||
| port: 9876, | ||
|
|
||
|
|
||
| // enable / disable colors in the output (reporters and logs) | ||
| colors: true, | ||
|
|
||
|
|
||
| // level of logging | ||
| // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG | ||
| logLevel: config.LOG_INFO, | ||
|
|
||
|
|
||
| // enable / disable watching file and executing tests whenever any file changes | ||
| autoWatch: true, | ||
|
|
||
|
|
||
| // start these browsers | ||
| // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher | ||
| browsers: ['Firefox'], | ||
|
|
||
|
|
||
| // Continuous Integration mode | ||
| // if true, Karma captures browsers, runs the tests and exits | ||
| singleRun: false, | ||
|
|
||
| // Concurrency level | ||
| // how many browser should be started simultaneous | ||
| concurrency: Infinity | ||
| browsers: ['Chrome'], | ||
| singleRun: false | ||
| }) | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.