Skip to content

Commit

Permalink
WIP: replace testcafe with cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
dabeng committed Jan 30, 2023
1 parent 0c7bb0c commit af8998b
Show file tree
Hide file tree
Showing 24 changed files with 537 additions and 17,666 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ node_modules/

# System Files
.DS_Store

# e2e testing files
test/cypress/screenshots
test/cypress/videos
9 changes: 4 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
"tests"
],
"dependencies": {
"jquery": "~3.2.1",
"jquery-mockjax": "^2.2.0",
"jspdf": "^1.3.5",
"font-awesome": "^4.6.3",
"html2canvas": "^0.5.0-beta4"
"jquery": "^3.6.2",
"jquery-mockjax": "^2.6.0",
"jspdf": "^2.5.1",
"html2canvas": "^1.4.1"
}
}
13 changes: 13 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const { defineConfig } = require("cypress");

module.exports = defineConfig({
screenshotsFolder: "test/cypress/screenshots",
videosFolder: "test/cypress/videos",
e2e: {
supportFile: "test/cypress/support/e2e.{js,jsx,ts,tsx}",
specPattern: "test/cypress/e2e/**/*.cy.{js,jsx,ts,tsx}",
setupNodeEvents(on, config) {
// implement node event listeners here
},
},
});
2 changes: 2 additions & 0 deletions dist/css/jquery.orgchart.css
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,8 @@
position: absolute;
left: 5px;
bottom: -2px;
width: 1rem;
height: 1rem;
}

.orgchart .node .toggleBtn::before {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/jquery.orgchart.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/jquery.orgchart.js
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@
$children.addClass('sliding').removeClass('slide-up').eq(0).one('transitionend', { 'vNodes': $children }, this.expandVNodesEnd);
} else {
$descendants.addClass('sliding slide-up').eq(0).one('transitionend', { 'vNodes': $descendants }, this.collapseVNodesEnd);
$descendants.find('.toggleBtn').removeClass('oci-minus-square').addClass('oci-plus-square');
$descendants.find('.toggleBtn').removeClass('oci-minus-square oci-plus-square');
}
},
//
Expand Down
2 changes: 1 addition & 1 deletion dist/js/jquery.orgchart.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/jquery.orgchart.min.js.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var merge = require('merge-stream');
var csslint = require('gulp-csslint');
var cleanCSS = require('gulp-clean-css');
var sourcemaps = require('gulp-sourcemaps');
var testcafe = require('gulp-testcafe');
var cypress = require('cypress');
var jest = require('gulp-jest').default;
var paths = {
src: 'src',
Expand Down Expand Up @@ -65,8 +65,9 @@ gulp.task('visual-regression', function () {
});

gulp.task('e2e-tests', gulp.series('addAssets', function () {
return gulp.src('test/e2e/**/test.js')
.pipe(testcafe({ browsers: ['chrome:headless', 'firefox:headless'] }));
return cypress.run({
spec: 'test/cypress/e2e/**/*.cy.js',
});
}));

gulp.task('test', gulp.series('e2e-tests', 'visual-regression'));
Expand Down
Loading

0 comments on commit af8998b

Please sign in to comment.