Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
35 changes: 35 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
version: 2
jobs:
build:
working_directory: ~/Something
docker:
- image: circleci/ruby:2.5.1-node-browsers
environment:
PGHOST: localhost
PGUSER: Something
RAILS_ENV: test
- image: postgres:9.5
environment:
POSTGRES_USER: gerhardk19
POSTGRES_DB: battleships_test
POSTGRES_PASSWORD: rails
steps:
- checkout

# Restore Cached Dependencies
- type: cache-restore
name: Restore bundle cache
key: Something-{{ checksum "Gemfile.lock" }}

# Bundle install dependencies
- run: bundle install --path vendor/bundle

# Cache Dependencies
- type: cache-save
name: Store bundle cache
key: Something-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle
- run: dockerize -wait tcp://localhost:5432 -timeout 1m
- run: bundle exec rake db:setup
- run: bundle exec rspec
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ tmp/
log/
.gitkeep
db/schema.rb
coverage/*
coverage/**/
/coverage/
3 changes: 2 additions & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--colour
--require spec_helper
--format Fuubar
--color
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.1
1 change: 0 additions & 1 deletion .rvmrc

This file was deleted.

36 changes: 18 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.1'
gem 'rails', '5.2.0'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand All @@ -13,22 +13,21 @@ gem 'rails', '3.1.1'
# gem 'activerecord-sqlserver-adapter'
# gem 'ruby-odbc'
#end
gem "pg", "~> 0.11.0"
gem 'pg'

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.1.4'
gem 'coffee-rails', '~> 3.1.1'
gem 'uglifier', '>= 1.0.3'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end

gem 'jquery-rails'
gem "haml-rails", "~> 0.3.4"
gem "haml", "~> 3.1.3"
gem "inherited_resources"
gem "stateflow"
gem "formtastic", "~> 1.2.4"
gem 'haml-rails'
gem 'haml'
gem 'stateflow'
gem 'formtastic'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
Expand All @@ -43,17 +42,18 @@ gem "formtastic", "~> 1.2.4"
# gem 'ruby-debug19', :require => 'ruby-debug'

group :development,:test do
gem 'simplecov', '>= 0.4.0', :require => false, :group => :test
gem 'simplecov', :require => false, :group => :test
# Pretty printed test output
gem 'turn', :require => false
gem "rspec-rails", "~> 2.7.0"
gem "factory_girl_rails", "~> 1.2.0"
gem "fuubar", "~> 0.0.5"
gem 'rspec-rails'
gem 'factory_bot_rails'
gem 'rails-controller-testing'
gem 'fuubar'
#gem 'nokogiri', "~> 1.5.0"
gem 'representative'
gem "guard-rspec"
gem 'guard-rspec'
#gem 'guard-livereload'
gem "fakeweb"
gem "vcr"

gem 'webmock'
gem 'vcr'
gem 'pry'
end
Loading