Skip to content

Commit

Permalink
Merge pull request #41 from nfigueira/master
Browse files Browse the repository at this point in the history
Spring 2021 Group project Bulky update
  • Loading branch information
cycomachead authored May 25, 2021
2 parents 32405bc + c5454a2 commit 7c18465
Show file tree
Hide file tree
Showing 311 changed files with 11,211 additions and 17,063 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/.bundle

# Ignore all logfiles and tempfiles.
coverage
/log/*
/tmp/*
!/log/.keep
Expand Down Expand Up @@ -36,5 +37,4 @@ coverage/
/config/database.yml

/coverage/index.html
coverage/index.html
/config/local_env.yml
20 changes: 15 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,19 @@ dist: trusty

# make sure production-only gems are not installed
bundler_args: --without production
addons:
firefox: latest

before_install:
before_install:
- yes | gem update --system --force
- gem install bundler
- wget https://github.com/mozilla/geckodriver/releases/download/v0.29.1/geckodriver-v0.29.1-linux64.tar.gz
- mkdir geckodriver
- tar -xzf geckodriver-v0.29.1-linux64.tar.gz -C geckodriver
- export PATH=$PATH:$PWD/geckodriver

- npm install bootstrap-select
- npm install bootstrap-slider

env:
global:
Expand Down Expand Up @@ -43,14 +52,15 @@ script:
# insert here any other steps needed (load other sample data, etc) before starting tests
# run RSpec tests, and capture coverage
- bundle exec cucumber
- $CCTR format-coverage --output coverage/codeclimate.$SUITE.json
- $CCTR format-coverage -t simplecov -o coverage/codeclimate.cucumber.json coverage/.resultset.json
# run Cucumber scenarios, and capture coverage. --strict means undefined steps result in a failure.
- bundle exec rspec
- $CCTR format-coverage --output coverage/codeclimate.$SUITE.json --input-type simplecov
- $CCTR format-coverage -t simplecov -o coverage/codeclimate.rspec.json coverage/.resultset.json

after_script:
# combine coverage from all suites, and upload to CodeClimate
- $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage
- $CCTR after-build --exit-code $TRAVIS_TEST_RESULT
- $CCTR sum-coverage coverage/codeclimate.*.json -p 2
# - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then $CCTR upload-coverage; fi # Upload coverage/codeclimate.json
- $CCTR upload-coverage
# just in case, be paranoid and remove sensitive config info file
- rm -f config/application.yml
15 changes: 9 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ gem 'devise'

gem 'rspec-activemodel-mocks'

#use for zipping and downloading table csv's
gem 'rubyzip'
gem 'tempfile'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
Expand All @@ -60,6 +64,9 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'better_errors'
gem "binding_of_caller"

end


Expand All @@ -72,7 +79,6 @@ gem 'bootstrap', '~> 4.3.1'
gem "autoprefixer-rails"
gem 'jquery-rails'
gem 'bootstrap-glyphicons'
gem 'bootstrap-datepicker-rails'
gem 'jquery-turbolinks'
gem 'tinymce-rails', '~> 4.3', '>= 4.3.13'

Expand All @@ -89,6 +95,8 @@ group :test do
gem 'simplecov', :require => false
gem 'cucumber-rails', :require => false
gem 'cucumber-rails-training-wheels' # basic imperative step defs
gem 'selenium-webdriver'
gem 'webdriver', require: false
# gem 'database_cleaner' # required by Cucumber
gem "rspec"
#gem 'factory_girl_rails', :require => false # if using FactoryGirl
Expand All @@ -97,8 +105,3 @@ group :test do
gem 'coveralls'
gem 'simplecov-console'
end

group :development, :test do
gem 'jasmine-rails' # if you p
end

51 changes: 32 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,19 @@ GEM
backports (3.13.0)
bcrypt (3.1.12)
bcrypt (3.1.12-x64-mingw32)
better_errors (2.9.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.7.0)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.4.3)
msgpack (~> 1.0)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
bootstrap-datepicker-rails (1.8.0.1)
railties (>= 3.0)
bootstrap-glyphicons (0.0.1)
railties (>= 3.0)
sass (>= 3.2)
Expand All @@ -81,6 +85,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
childprocess (3.0.0)
chronic (0.10.2)
churn (0.0.35)
chronic (>= 0.2.3)
Expand Down Expand Up @@ -139,6 +144,7 @@ GEM
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.7.0)
debug_inspector (1.1.0)
devise (4.6.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -199,12 +205,6 @@ GEM
i18n (1.6.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jasmine-core (3.4.0)
jasmine-rails (0.15.0)
jasmine-core (>= 1.3, < 4.0)
phantomjs (>= 1.9)
railties (>= 3.2.0)
sprockets-rails
jbuilder (2.8.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
Expand Down Expand Up @@ -258,9 +258,11 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.0.1)
mini_portile2 (2.4.0)
mini_portile2 (2.5.0)
minitest (5.11.3)
msgpack (1.2.10)
msgpack (1.2.10-x64-mingw32)
Expand All @@ -269,10 +271,11 @@ GEM
nenv (0.3.0)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.2-x64-mingw32)
mini_portile2 (~> 2.4.0)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.3-x64-mingw32)
racc (~> 1.4)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
Expand All @@ -283,14 +286,14 @@ GEM
path_expander (1.0.3)
pg (1.1.4)
pg (1.1.4-x64-mingw32)
phantomjs (2.1.1.0)
popper_js (1.14.5)
procto (0.0.3)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
puma (3.12.1)
racc (1.5.2)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -337,7 +340,7 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (2.2.2)
rake
rake (12.3.2)
rake (13.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand Down Expand Up @@ -391,6 +394,7 @@ GEM
ruby_dep (1.5.0)
ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyzip (2.3.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand All @@ -411,6 +415,9 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sexp_processor (4.12.0)
shellany (0.0.1)
simplecov (0.13.0)
Expand All @@ -434,6 +441,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
tempfile (0.1.1)
temple (0.8.1)
term-ansicolor (1.7.1)
tins (~> 1.0)
Expand Down Expand Up @@ -471,6 +479,7 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webdriver (0.18.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
Expand All @@ -484,9 +493,10 @@ PLATFORMS
DEPENDENCIES
autoprefixer-rails
bcrypt (~> 3.1.7)
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
bootstrap (~> 4.3.1)
bootstrap-datepicker-rails
bootstrap-glyphicons
byebug
codeclimate-test-reporter
Expand All @@ -500,7 +510,6 @@ DEPENDENCIES
friendly_id (~> 5.1.0)
guard-rspec
haml
jasmine-rails
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
Expand All @@ -514,19 +523,23 @@ DEPENDENCIES
rspec
rspec-activemodel-mocks
rspec-rails (~> 3.8)
rubyzip
sass-rails (~> 5.0)
selenium-webdriver
simplecov
simplecov-console
spring
spring-watcher-listen (~> 2.0.0)
tempfile
tinymce-rails (~> 4.3, >= 4.3.13)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
webdriver

RUBY VERSION
ruby 2.5.3p105

BUNDLED WITH
2.0.2
2.2.15
Loading

0 comments on commit 7c18465

Please sign in to comment.