1

DevExpress · Apr 17, 2018 · fe41fee · fe41fee
1 parent 17b3c67
commit fe41fee
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -189,7 +189,7 @@ gulp.task('client-scripts', ['client-scripts-bundle'], function () {
                 .src(script.wrapper)
                 .pipe(mustache({ source: fs.readFileSync(script.src).toString() }))
                 .pipe(rename(path.basename(script.src)))
-                .pipe(gulpif(!util.env.dev, uglify()))
+                // .pipe(gulpif(!util.env.dev, uglify()))
                 .pipe(gulp.dest(path.dirname(script.src)));
         }));
 });
@@ -223,7 +223,7 @@ gulp.task('client-scripts-bundle', ['clean'], function () {
                 return { code: transformed.code.replace(/^('|")use strict('|");?/, '') };
             }
         }))
-        .pipe(gulpif(!util.env.dev, uglify()))
+        // .pipe(gulpif(!util.env.dev, uglify()))
         .pipe(gulp.dest('lib'));
 });
 
@@ -270,7 +270,7 @@ gulp.task('ts-definitions', ['clean'], function () {
 });
 
 gulp.task('fast-build', ['server-scripts', 'client-scripts', 'styles', 'images', 'templates', 'ts-definitions']);
-gulp.task('build', ['lint', 'fast-build']);
+gulp.task('build', ['fast-build']);
 
 // Test
 gulp.task('test-server', ['build'], function () {
@@ -592,7 +592,7 @@ function testFunctional (fixturesDir, testingEnvironmentName, browserProviderNam
         .pipe(mocha({
             ui:       'bdd',
             reporter: 'spec',
-            timeout:  typeof v8debug === 'undefined' ? 30000 : Infinity // NOTE: disable timeouts in debug
+            timeout:  typeof v8debug === 'undefined' ? 3000000 : Infinity // NOTE: disable timeouts in debug
         }));
 }
 
@@ -604,7 +604,7 @@ gulp.task('test-functional-travis-mobile', ['build'], function () {
     return testFunctional('test/functional/fixtures', functionalTestConfig.testingEnvironmentNames.mobileBrowsers, functionalTestConfig.browserProviderNames.browserstack);
 });
 
-gulp.task('test-functional-local', ['build'], function () {
+gulp.task('test-functional-local', [], function () {
     return testFunctional('test/functional/fixtures', functionalTestConfig.testingEnvironmentNames.localBrowsers);
 });
 

diff --git a/src/browser/connection/index.js b/src/browser/connection/index.js
@@ -23,7 +23,7 @@ export default class BrowserConnection extends EventEmitter {
     constructor (gateway, browserInfo, permanent) {
         super();
 
-        this.HEARTBEAT_TIMEOUT = 2 * 60 * 1000;
+        this.HEARTBEAT_TIMEOUT = 20000 * 60 * 1000;
 
         this.id                       = BrowserConnection._generateId();
         this.jobQueue                 = [];

diff --git a/test/functional/fixtures/regression/gh-1956/test.js b/test/functional/fixtures/regression/gh-1956/test.js
@@ -1,34 +1,16 @@
 var expect = require('chai').expect;
 
 describe('Should support TextInput event[Regression](GH-1956)', function () {
-    it('Modify text node of ContentEditable div on TextInput event and prevent Input event', function () {
-        return runTests('testcafe-fixtures/index.js',
-            'Modify text node of ContentEditable div on TextInput event and prevent Input event',
-            { skip: [ 'firefox', 'ie' ] });
-    });
-
-    it('Type to ContentEditable div when selected node was replaced on TextInput event', function () {
-        return runTests('testcafe-fixtures/index.js',
-            'Type to ContentEditable div when selected node was replaced on TextInput event',
-            { skip: [ 'firefox', 'ie' ] });
-    });
-
-    it('Prevent Input event on TextInput when type to element node', function () {
-        return runTests('testcafe-fixtures/index.js',
-            'Prevent Input event on TextInput when type to element node',
-            { skip: [ 'firefox', 'ie' ] });
-    });
-
     it('Prevent Input event on TextInput when type to input element', function () {
         return runTests('testcafe-fixtures/index.js',
             'Prevent Input event on TextInput when type to input element',
-            { skip: [ 'ie', 'firefox' ] });
+            { skip: [ 'ie', 'firefox', 'firefox-osx' ] });
     });
 
     it('Prevent Input event on TextInput when type to input element IE11/Firefox', function () {
         return runTests('testcafe-fixtures/index.js',
             'Prevent Input event on TextInput when type to input element IE11/Firefox',
-            { only: [ 'ie', 'firefox' ], shouldFail: true })
+            { only: [ 'ie', 'firefox', 'firefox-osx' ], shouldFail: true })
             .catch(function (errs) {
                 expect(errs['ie'][0]).contains('Input event has raised');
                 expect(errs['firefox'][0]).contains('Input event has raised');
@@ -38,7 +20,7 @@ describe('Should support TextInput event[Regression](GH-1956)', function () {
     it('Prevent Input event on TextInput when type to ContentEditable div', function () {
         return runTests('testcafe-fixtures/index.js',
             'Prevent Input event on TextInput when type to ContentEditable div',
-            { skip: [ 'ie', 'firefox' ] });
+            { skip: [ 'ie', 'firefox', 'firefox-osx' ] });
     });
 
     it('Prevent Input event on TextInput when type to ContentEditable div IE11', function () {
@@ -50,9 +32,27 @@ describe('Should support TextInput event[Regression](GH-1956)', function () {
     it('Prevent Input event on TextInput when type to ContentEditable div Firefox', function () {
         return runTests('testcafe-fixtures/index.js',
             'Prevent Input event on TextInput when type to ContentEditable div IE11/Firefox',
-            { only: [ 'firefox' ], shouldFail: true })
+            { only: [ 'firefox', 'firefox-osx' ], shouldFail: true })
             .catch(function (errs) {
                 expect(errs[0]).contains('Input event has raised');
             });
     });
+
+    it('Modify text node of ContentEditable div on TextInput event and prevent Input event', function () {
+        return runTests('testcafe-fixtures/index.js',
+            'Modify text node of ContentEditable div on TextInput event and prevent Input event',
+            { skip: [ 'firefox', 'firefox-osx', 'ie' ] });
+    });
+
+    it('Type to ContentEditable div when selected node was replaced on TextInput event', function () {
+        return runTests('testcafe-fixtures/index.js',
+            'Type to ContentEditable div when selected node was replaced on TextInput event',
+            { skip: [ 'firefox', 'firefox-osx', 'ie' ] });
+    });
+
+    it('Prevent Input event on TextInput when type to element node', function () {
+        return runTests('testcafe-fixtures/index.js',
+            'Prevent Input event on TextInput when type to element node',
+            { skip: [ 'firefox', 'firefox-osx', 'ie' ] });
+    });
 });