From: Dobrica Pavlinusic Date: Wed, 23 Jan 2013 01:21:49 +0000 (+0100) Subject: split describe registration_type accomp X-Git-Tag: 0.7~42 X-Git-Url: http://git.rot13.org/?p=angular-drzb;a=commitdiff_plain;h=3281f1ad855e4d18a28f2470e5cc8b1a4f2f6489 split describe registration_type accomp --- diff --git a/app/js/testApp.js b/app/js/testApp.js new file mode 100644 index 0000000..51295a7 --- /dev/null +++ b/app/js/testApp.js @@ -0,0 +1,24 @@ +// https://groups.google.com/forum/?fromgroups=#!searchin/angular/e2e$20mock|sort:date/angular/ObdxCoCObYU/KENkGVfIZYkJ + +angular.module('testApp', ['myApp', 'ngMockE2E' ]). + run(function ($httpBackend) { + console.log('mock $httpBackend', $httpBackend); + $httpBackend.whenGET(/partials\/.*/).passThrough(); + $httpBackend.whenJSONP(/./).passThrough(); + $httpBackend.whenGET(/registration/).passThrough(); + $httpBackend.whenPOST(/registration/).passThrough(); + } +); + +// mock console for IE +if(!window.console) { + window.console = new function() { + this.log = function(str) {}; + this.info = function(str) {}; + this.debug = function(str) {}; + }; +} + + +console.log('mock testApp'); + diff --git a/test/e2e/scenarios.js b/test/e2e/scenarios.js index 61e79eb..4bd1abf 100644 --- a/test/e2e/scenarios.js +++ b/test/e2e/scenarios.js @@ -52,6 +52,10 @@ describe('myApp', function() { expect(r.count()).toBe(4); // expect(r.row(0)).toEqual({}); }); + + }); + + describe('registration_type accomp', function() { var registration_url; @@ -68,7 +72,7 @@ describe('myApp', function() { element('#edit-registration').click(); expect(browser().location().url()).toMatch(/registration/); registration_url = browser().location().url(); - console.log('registration_url', registration_url); + //dump('registration_url', registration_url); }); it('accomp finish registration', function() { diff --git a/test/e2e/testApp.js b/test/e2e/testApp.js deleted file mode 100644 index 51295a7..0000000 --- a/test/e2e/testApp.js +++ /dev/null @@ -1,24 +0,0 @@ -// https://groups.google.com/forum/?fromgroups=#!searchin/angular/e2e$20mock|sort:date/angular/ObdxCoCObYU/KENkGVfIZYkJ - -angular.module('testApp', ['myApp', 'ngMockE2E' ]). - run(function ($httpBackend) { - console.log('mock $httpBackend', $httpBackend); - $httpBackend.whenGET(/partials\/.*/).passThrough(); - $httpBackend.whenJSONP(/./).passThrough(); - $httpBackend.whenGET(/registration/).passThrough(); - $httpBackend.whenPOST(/registration/).passThrough(); - } -); - -// mock console for IE -if(!window.console) { - window.console = new function() { - this.log = function(str) {}; - this.info = function(str) {}; - this.debug = function(str) {}; - }; -} - - -console.log('mock testApp'); -