diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 17:55:30 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 17:55:30 +0200 |
commit | 6208debf043fc8af28de13515dec4d10ace99bc3 (patch) | |
tree | 3d1cfc3a94b622f5fc7c65fac0a8f9fb8aadfb37 /js | |
parent | 4fa9c6d6cfc24b848bc8bb1526ef8ef50f046cb3 (diff) |
use firefox for ci and e2e
Diffstat (limited to 'js')
-rw-r--r-- | js/Gruntfile.js | 13 | ||||
-rw-r--r-- | js/build/app.js | 16 | ||||
-rw-r--r-- | js/gui/app.js | 36 | ||||
-rw-r--r-- | js/protractor.chrome.conf.js | 41 | ||||
-rw-r--r-- | js/protractor.conf.js (renamed from js/protractor.phantomjs.conf.js) | 2 |
5 files changed, 57 insertions, 51 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js index 58764d823..03a0c607c 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -150,16 +150,11 @@ module.exports = function (grunt) { } }, protractor: { - phantomjs: { + firefox: { options: { - configFile: 'protractor.phantomjs.conf.js' + configFile: 'protractor.conf.js' } }, - chrome: { - options: { - configFile: 'protractor.chrome.conf.js' - } - } }, connect: { server: { @@ -175,7 +170,7 @@ module.exports = function (grunt) { grunt.registerTask('dev', ['watch:concat']); grunt.registerTask('test', ['karma:unit']); grunt.registerTask('php', ['watch:phpunit']); - grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor:chrome']); + grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor']); grunt.registerTask('ci-unit', ['default', 'karma:continuous']); - grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor:phantomjs']); + grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor']); };
\ No newline at end of file diff --git a/js/build/app.js b/js/build/app.js index 2725a18a1..180bde700 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -882,6 +882,22 @@ var $__build_47_app__ = function () { } }); }(window, document, jQuery)); + (function (window, document, $) { + 'use strict'; + $(document).ready(function () { + var buttons = $(':not([data-app-slide-toggle-area=""])'); + $(document).click(function (event) { + buttons.each(function (index, button) { + console.log(button); + var area = $(button).data('app-slide-toggle-area'); + if (button === event.target) { + console.log(area); + event.stopPropagation(); + } + }); + }); + }); + }(window, document, jQuery)); var call = Function.prototype.call.bind(Function.prototype.call); var hasOwn = Object.prototype.hasOwnProperty; window.items = function (obj) { diff --git a/js/gui/app.js b/js/gui/app.js new file mode 100644 index 000000000..171911cec --- /dev/null +++ b/js/gui/app.js @@ -0,0 +1,36 @@ +/** + * ownCloud - core + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @copyright Bernhard Posselt 2014 + */ + +(function (window, document, $) { + + 'use strict'; + + $(document).ready(function () { + + var buttons = $('[data-app-slide-toggle-area]:not([data-app-slide-toggle-area=""])'); + + $(document).click(function (event) { + + buttons.each(function (index, button) { + console.log(button); + + var area = $(button).data('app-slide-toggle-area'); + + // if the + if (button === event.target) { + console.log(area); + event.stopPropagation(); + } + }); + + }); + }); + +}(window, document, jQuery));
\ No newline at end of file diff --git a/js/protractor.chrome.conf.js b/js/protractor.chrome.conf.js deleted file mode 100644 index 09b597c08..000000000 --- a/js/protractor.chrome.conf.js +++ /dev/null @@ -1,41 +0,0 @@ -/** - * ownCloud - News - * - * This file is licensed under the Affero General Public License version 3 or - * later. See the COPYING file. - * - * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2014 - */ - -var baseUrl = 'http://localhost'; - -exports.config = { - seleniumAddress: 'http://localhost:4444/wd/hub', - specs: ['tests/e2e/**/*.js'], - onPrepare: function () { - 'use strict'; - - browser.ignoreSynchronization = true; - browser.get(baseUrl + '/owncloud/index.php'); - browser.findElement(By.id('user')).sendKeys('admin'); - browser.findElement(By.id('password')).sendKeys('admin'); - browser.findElement(By.id('submit')).click(); - - browser.driver.wait(function () { - return browser.driver.getCurrentUrl().then(function (url) { - var regex = /apps/; - return regex.test(url); - }); - }); - - browser.get(baseUrl + '/owncloud/index.php/apps/news/'); - browser.driver.wait(function () { - return browser.driver.getCurrentUrl().then(function (url) { - var regex = /apps\/news/; - return regex.test(url); - }); - }); - }, - baseUrl: baseUrl -};
\ No newline at end of file diff --git a/js/protractor.phantomjs.conf.js b/js/protractor.conf.js index 73ed555cf..2651c89ab 100644 --- a/js/protractor.phantomjs.conf.js +++ b/js/protractor.conf.js @@ -38,7 +38,7 @@ exports.config = { }); }, capabilities: { - browserName: 'phantomjs', + browserName: 'firefox', version: '', platform: 'ANY' }, |