Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
a05caf1
Move barcodes from tube rack into plate
emrojo Nov 4, 2019
caaf2fc
Merge branch 'next_release' of https://github.com/sanger/samples_extr…
emrojo Nov 4, 2019
edb54e2
Merge pull request #71 from emrojo/add_runner_move_barcodes_from_tube…
emrojo Nov 5, 2019
21c7599
Added functionality to add callbacks that listen to fact changes.
emrojo Nov 5, 2019
38a1375
Unpadded locations where creating a problem of not finding locations in
emrojo Nov 5, 2019
de769a6
Delayed job max run time can be configured by providing a environment
emrojo Nov 11, 2019
4c9a5ec
Merge pull request #73 from emrojo/callbacks_for_fact_changes
emrojo Nov 11, 2019
9927c66
Merge branch 'next_release' of https://github.com/sanger/samples_extr…
emrojo Nov 11, 2019
ec06193
Merge pull request #74 from emrojo/configure_max_tim_delayed_jobs
pjvv Nov 11, 2019
14af944
Refactoring unrack
emrojo Nov 17, 2019
472a6d8
Refactoring tests for reracking refactor
emrojo Nov 17, 2019
7507b6d
More tests refactor for reracking
emrojo Nov 17, 2019
f59e8f6
Removed unneeded require
emrojo Nov 17, 2019
aad454d
Refactoring import
emrojo Nov 18, 2019
568c85e
Refactor of the import module
emrojo Nov 18, 2019
551f5df
Created initializer to configure initial callbacks for FactChanges
emrojo Nov 20, 2019
8077fc5
Removed comments
emrojo Nov 20, 2019
80afa80
Test for callbacks
emrojo Nov 20, 2019
39f9cca
Tests for callbacks and callback initializers
emrojo Nov 21, 2019
39a1ae9
Some more callbacks tests
emrojo Nov 21, 2019
477abaf
Start channels websockets server refactor
emrojo Nov 21, 2019
0c61d69
Merge branch 'master' of https://github.com/sanger/samples_extraction…
emrojo Nov 22, 2019
380f014
Merge branch 'refactor_import_and_reracking' into channels_refactor
emrojo Nov 22, 2019
828f32f
Refactor import
emrojo Nov 24, 2019
b6081ec
Added more tests for the importers and sequencescape client
emrojo Nov 24, 2019
ec594bc
Remote digest wont update the digest on import assets. Instead it will
emrojo Nov 24, 2019
b2bb156
Asset groups elements should keep order.
emrojo Nov 25, 2019
d44f169
Merge branch 'master' of https://github.com/sanger/samples_extraction…
KatyTaylor Dec 4, 2019
b16a869
Merge pull request #78 from sanger/sync-with-master
KatyTaylor Dec 5, 2019
a0095a1
Merge pull request #81 from sanger/master
pjvv Dec 13, 2019
9e90777
Merge branch 'develop' of https://github.com/sanger/samples_extractio…
emrojo Dec 14, 2019
54feb9e
Merge branch 'channels_refactor' into refactor_import_and_reracking
emrojo Dec 14, 2019
0a6da8e
More work on tests and refactor
emrojo Dec 15, 2019
10875ed
Some more test refactor
emrojo Dec 15, 2019
8948711
Passing the tests
emrojo Dec 15, 2019
e864673
Upgraded gems
emrojo Dec 15, 2019
f625e31
Added feature test for Activity creation
emrojo Dec 15, 2019
6718964
Code review
emrojo Dec 16, 2019
2bc1f6f
Merge pull request #75 from emrojo/refactor_import_and_reracking
emrojo Dec 16, 2019
7dd6fa6
Merge branch 'master' of https://github.com/sanger/samples_extraction…
emrojo Dec 18, 2019
3974353
Feature test that scans labware in an activity
emrojo Dec 18, 2019
3c0ec87
Added feature test that run steps
emrojo Dec 19, 2019
768f15c
Redis disable unless feature test
emrojo Dec 19, 2019
1ff52a0
Added feature test to the list of tests to run automaticatlly
emrojo Dec 19, 2019
82fca51
Addons chrome
emrojo Dec 19, 2019
b219b16
Trying with xfvb
emrojo Dec 19, 2019
e01cca7
Google webdrivers
emrojo Dec 19, 2019
8a80ce7
Webdrivers
emrojo Dec 19, 2019
9035f23
Some more travis
emrojo Dec 19, 2019
98ffe7a
Start chrome
emrojo Dec 19, 2019
184ac4e
Download chromedriver
emrojo Dec 19, 2019
9aa47fb
Try linux
emrojo Dec 19, 2019
adcf002
Step for removing barcodes from tubes
emrojo Jan 12, 2020
837d667
Trying linking chromedriver for travis
emrojo Jan 12, 2020
16a32ec
Filter out feature tests unless specified
emrojo Jan 12, 2020
edf48eb
Rspec in 2 running feature tests and unit/functional tests in separat…
emrojo Jan 12, 2020
dc1110a
Debugging where is the driver
emrojo Jan 12, 2020
ed11847
New attempt, this time downloading the driver
emrojo Jan 12, 2020
2b185f4
Try again with the drivers downloaded
emrojo Jan 12, 2020
3cee388
Moved constant to variable
emrojo Jan 12, 2020
e5c7030
Merge pull request #84 from emrojo/feature_tests
emrojo Jan 13, 2020
77b3b39
Merge pull request #85 from sanger/develop
emrojo Jan 13, 2020
742eeab
Specify version of node js
emrojo Jan 13, 2020
3196b14
Specify version of node with nvmrc
emrojo Jan 13, 2020
af9e365
Specific version for node
emrojo Jan 13, 2020
b68e036
Install LTS version of node js
emrojo Jan 13, 2020
2f5d8e3
Upgraded versions of node modules
emrojo Jan 13, 2020
b308a6e
Upgrade version of node-sass to 4.12
emrojo Jan 13, 2020
0a83dbb
Version of node-sass to 4.12.0
emrojo Jan 13, 2020
fdb59bc
Merge pull request #86 from sanger/nodeJs_and_webpacker
emrojo Jan 13, 2020
65f97fd
Merge pull request #87 from sanger/develop
emrojo Jan 13, 2020
18fa28a
Bump puma from 3.7.1 to 4.3.3
dependabot[bot] Mar 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v12.14.1
15 changes: 14 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,38 @@
language: ruby
dist: xenial
sudo: required
addons:
chrome: stable
cache:
bundler: true
yarn: true
directories:
- node_modules
- vendor/bundle
before_install:
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
install:
- bundle install --deployment
- nvm install
- node --version
- yarn install
before_script:
- export SECRET_KEY_BASE=`bundle exec rake secret`
- bundle exec rake db:create RAILS_ENV=test
- RAILS_ENV=test bundle exec rails webdrivers:chromedriver:update -r webdrivers
- ln -s /home/travis/.webdrivers/chromedriver ~/bin/chromedriver
- export PATH=~/bin:$PATH
script:
- bundle exec rake
- bundle exec rspec
- xvfb-run -a bundle exec rspec --tag browser
- yarn test
after_success:
- chmod +x ./compile-build
- "./compile-build"
services:
- redis-server
- mysql
- xvfb
deploy:
provider: releases
api_key:
Expand Down
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ gem 'jquery-rails'
gem 'react-rails'
gem 'sass-rails'
gem 'bootstrap-sass'
gem 'sass'
gem 'will_paginate'
gem 'will_paginate-bootstrap'

Expand Down Expand Up @@ -83,6 +84,11 @@ group :test do
gem 'rails-controller-testing'
gem 'database_cleaner'
gem 'json-schema'
gem 'capybara'
gem 'selenium-webdriver'
gem 'mock_redis'
# Keep webdriver in sync with chrome to prevent frustrating CI failures
gem 'webdrivers', require: false
end

group :test do
Expand Down
Loading