Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Commit

Permalink
Fix & Dockerize Selenium tests
Browse files Browse the repository at this point in the history
Fixes #6.
  • Loading branch information
Jacob Peddicord committed Aug 17, 2017
1 parent 02171c2 commit 23f7f79
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 338 deletions.
6 changes: 3 additions & 3 deletions browser/components/projects/editor/Onboarding.tsx
Expand Up @@ -21,19 +21,19 @@ import ProjectOnboardingForm from './ProjectOnboardingForm';

interface Props {
dispatch: (action: any) => any;
claims?: any;
info: any;
}

class Onboarding extends Component<Props, {}> {

render() {
const { dispatch, claims } = this.props;
const { dispatch, info } = this.props;
return (
<div>
<h2>Tell us about your project</h2>
<ProjectOnboardingForm
createProject={(details) => dispatch(ProjectActions.createProject(details))}
groups={claims != null ? claims.groups : []}
groups={info != null && info.groups != null ? info.groups : []}
/>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml → docker-compose.dev.yml
Expand Up @@ -4,6 +4,6 @@ services:
database:
image: postgres
ports:
- 5432:5432
- 5432:5432
volumes:
- ./sql:/docker-entrypoint-initdb.d
23 changes: 23 additions & 0 deletions docker-compose.selenium.yml
@@ -0,0 +1,23 @@
version: '2'

services:
web:
build: .
ports:
- 8000:8000
links:
- database
environment:
- USER
database:
image: postgres
volumes:
- ./sql:/docker-entrypoint-initdb.d
selenium:
# use standalone-chrome-debug if you want to VNC in and watch
image: selenium/standalone-chrome
ports:
- 4444:4444
- 5900:5900
links:
- web
6 changes: 3 additions & 3 deletions docker-compose.yml
Expand Up @@ -4,11 +4,11 @@ services:
web:
build: .
ports:
- 8000:8000
- 8000:8000
links:
- database
- database
environment:
- USER
- USER
database:
image: postgres
volumes:
Expand Down
15 changes: 1 addition & 14 deletions gulpfile.js
Expand Up @@ -62,7 +62,7 @@ gulp.task('copy-config', () => {
.pipe(gulp.dest('build/config'));
});

gulp.task('test-server', ['build-server'], () => {
gulp.task('test', ['build-server'], () => {
require('source-map-support/register');
require('core-js/shim');
const winston = require('winston');
Expand All @@ -72,19 +72,6 @@ gulp.task('test-server', ['build-server'], () => {
.pipe(jasmine());
});

gulp.task('test-ui', ['default', 'build-selenium', 'local-server'], () => {
require('source-map-support/register');
require('core-js/shim');
process.on('unhandledRejection', err => {console.error('\nUnhandled rejection:', err.stack)});
return gulp.src('build/selenium/**/*.spec.js')
.pipe(jasmine({config: {random: false}}))
.on('end', () => {
node.kill();
});
});

gulp.task('test', ['test-server']);

let node;
gulp.task('local-server', ['build-server'], done => {
if (node) {
Expand Down

0 comments on commit 23f7f79

Please sign in to comment.