Merge pull request #257 from RickCarlino/master
Upgrade to Latest Rails 4, Start Regimen Persistence.pull/261/head
Rick Carlino
GitHub
commit
c64b09f860
2
Gemfile
2
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source 'https://rubygems.org'
|
||||
ruby '2.3.1'
|
||||
|
||||
gem 'rails', '4.2.4'
|
||||
gem 'rails', '4.2.7'
|
||||
|
||||
#Dokku demands this one.
|
||||
gem 'rails_12factor'
|
||||
|
|
|
|||
297
Gemfile.lock
297
Gemfile.lock
|
|
@ -1,19 +1,18 @@
|
|||
GIT
|
||||
remote: git://github.com/RickCarlino/smarf_doc.git
|
||||
revision: 88394bf9dbadf1fa4b89c370ffc5ae12d0c0611e
|
||||
revision: 40dc733363431c6153ccebbeb80df942a77f0b02
|
||||
specs:
|
||||
smarf_doc (0.0.1)
|
||||
smarf_doc (1.0.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/plataformatec/devise.git
|
||||
revision: d22ac4a4fb304ea93c728efe955535cb6b8b6a86
|
||||
revision: 6720f93d2c54904f10b6e6d6beb51d0b5b330976
|
||||
specs:
|
||||
devise (3.5.2)
|
||||
devise (4.2.0)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
railties (>= 4.1.0, < 5.1)
|
||||
responders
|
||||
thread_safe (~> 0.1)
|
||||
warden (~> 1.2.3)
|
||||
|
||||
GEM
|
||||
|
|
@ -21,38 +20,38 @@ GEM
|
|||
remote: https://rails-assets.org/
|
||||
specs:
|
||||
abstract_type (0.0.7)
|
||||
actionmailer (4.2.4)
|
||||
actionpack (= 4.2.4)
|
||||
actionview (= 4.2.4)
|
||||
activejob (= 4.2.4)
|
||||
actionmailer (4.2.7)
|
||||
actionpack (= 4.2.7)
|
||||
actionview (= 4.2.7)
|
||||
activejob (= 4.2.7)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.4)
|
||||
actionview (= 4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
actionpack (4.2.7)
|
||||
actionview (= 4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
actionview (4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
active_model_serializers (0.8.3)
|
||||
activemodel (>= 3.0)
|
||||
activejob (4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
activejob (4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
activemodel (4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.4)
|
||||
activemodel (= 4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
activerecord (4.2.7)
|
||||
activemodel (= 4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.4)
|
||||
activesupport (4.2.7)
|
||||
i18n (~> 0.7)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -61,22 +60,23 @@ GEM
|
|||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.3.8)
|
||||
addressable (2.4.0)
|
||||
arel (6.0.3)
|
||||
arrayfields (4.9.2)
|
||||
ast (2.1.0)
|
||||
bcrypt (3.1.10)
|
||||
bson (3.2.6)
|
||||
ast (2.3.0)
|
||||
bcrypt (3.1.11)
|
||||
bson (4.1.1)
|
||||
builder (3.2.2)
|
||||
cane (2.6.2)
|
||||
parallel
|
||||
capybara (2.5.0)
|
||||
capybara (2.7.1)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.5.8)
|
||||
childprocess (0.5.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chronic (0.10.2)
|
||||
churn (0.0.35)
|
||||
|
|
@ -90,45 +90,48 @@ GEM
|
|||
code_analyzer (0.4.5)
|
||||
sexp_processor
|
||||
code_metrics (0.1.3)
|
||||
codeclimate-test-reporter (0.4.8)
|
||||
codeclimate-test-reporter (0.6.0)
|
||||
simplecov (>= 0.7.1, < 1.0.0)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.1.0)
|
||||
coderay (1.1.1)
|
||||
coffee-rails (4.2.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
railties (>= 4.0.0, < 5.2.x)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.10.0)
|
||||
colored (1.2)
|
||||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.0.2)
|
||||
diff-lcs (1.2.5)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.25)
|
||||
domain_name (0.5.20160615)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
equalizer (0.0.11)
|
||||
erubis (2.7.0)
|
||||
execjs (2.6.0)
|
||||
factory_girl (4.5.0)
|
||||
execjs (2.7.0)
|
||||
factory_girl (4.7.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.5.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
factory_girl_rails (4.7.0)
|
||||
factory_girl (~> 4.7.0)
|
||||
railties (>= 3.0.0)
|
||||
faker (1.6.1)
|
||||
faker (1.6.6)
|
||||
i18n (~> 0.5)
|
||||
fattr (2.2.2)
|
||||
ffi (1.9.10)
|
||||
flay (2.6.1)
|
||||
fattr (2.3.0)
|
||||
ffi (1.9.14)
|
||||
flay (2.8.0)
|
||||
erubis (~> 2.7.0)
|
||||
path_expander (~> 1.0)
|
||||
ruby_parser (~> 3.0)
|
||||
sexp_processor (~> 4.0)
|
||||
flog (4.3.2)
|
||||
flog (4.4.0)
|
||||
path_expander (~> 1.0)
|
||||
ruby_parser (~> 3.1, > 3.1.0)
|
||||
sexp_processor (~> 4.4)
|
||||
font-awesome-rails (4.5.0.0)
|
||||
railties (>= 3.2, < 5.0)
|
||||
globalid (0.3.6)
|
||||
font-awesome-rails (4.6.3.1)
|
||||
railties (>= 3.2, < 5.1)
|
||||
globalid (0.3.7)
|
||||
activesupport (>= 4.1.0)
|
||||
haikunator (1.1.0)
|
||||
haml (4.0.7)
|
||||
|
|
@ -138,23 +141,23 @@ GEM
|
|||
http-cookie (1.0.2)
|
||||
domain_name (~> 0.5)
|
||||
i18n (0.7.0)
|
||||
ice_cube (0.13.0)
|
||||
ice_nine (0.11.1)
|
||||
ice_cube (0.14.0)
|
||||
ice_nine (0.11.2)
|
||||
json (1.8.3)
|
||||
json_pure (1.8.3)
|
||||
jwt (1.5.2)
|
||||
json_pure (2.0.2)
|
||||
jwt (1.5.4)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
main (6.1.0)
|
||||
mail (2.6.4)
|
||||
mime-types (>= 1.16, < 4)
|
||||
main (6.2.0)
|
||||
arrayfields (>= 4.7.4)
|
||||
chronic (>= 0.6.2)
|
||||
fattr (>= 2.2.0)
|
||||
map (>= 5.1.0)
|
||||
map (6.5.5)
|
||||
map (>= 6.1.0)
|
||||
map (6.6.0)
|
||||
memoizable (0.4.2)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
method_source (0.8.2)
|
||||
|
|
@ -173,30 +176,35 @@ GEM
|
|||
reek (>= 1.3.4, < 3.0)
|
||||
roodi (~> 3.1)
|
||||
metric_fu-Saikuro (1.1.3)
|
||||
mime-types (2.99)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.8.3)
|
||||
mongo (2.1.2)
|
||||
bson (~> 3.0)
|
||||
mongoid (5.0.1)
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.9.0)
|
||||
mongo (2.2.7)
|
||||
bson (~> 4.0)
|
||||
mongoid (5.0.2)
|
||||
activemodel (~> 4.0)
|
||||
mongo (~> 2.1)
|
||||
origin (~> 2.1)
|
||||
tzinfo (>= 0.3.37)
|
||||
multi_json (1.11.2)
|
||||
mutations (0.7.2)
|
||||
multi_json (1.12.1)
|
||||
mutations (0.8.0)
|
||||
activesupport
|
||||
netrc (0.11.0)
|
||||
ng-rails-csrf (0.1.0)
|
||||
nokogiri (1.6.6.4)
|
||||
mini_portile (~> 0.6.0)
|
||||
origin (2.1.1)
|
||||
nokogiri (1.6.8)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
pkg-config (~> 1.1.7)
|
||||
origin (2.2.0)
|
||||
orm_adapter (0.5.0)
|
||||
parallel (1.6.1)
|
||||
parser (2.2.3.0)
|
||||
ast (>= 1.1, < 3.0)
|
||||
procto (0.0.2)
|
||||
pry (0.10.3)
|
||||
parallel (1.9.0)
|
||||
parser (2.3.1.2)
|
||||
ast (~> 2.2)
|
||||
path_expander (1.0.0)
|
||||
pkg-config (1.1.7)
|
||||
procto (0.0.3)
|
||||
pry (0.10.4)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
|
|
@ -204,134 +212,132 @@ GEM
|
|||
rack-cors (0.4.0)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.4)
|
||||
actionmailer (= 4.2.4)
|
||||
actionpack (= 4.2.4)
|
||||
actionview (= 4.2.4)
|
||||
activejob (= 4.2.4)
|
||||
activemodel (= 4.2.4)
|
||||
activerecord (= 4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
rails (4.2.7)
|
||||
actionmailer (= 4.2.7)
|
||||
actionpack (= 4.2.7)
|
||||
actionview (= 4.2.7)
|
||||
activejob (= 4.2.7)
|
||||
activemodel (= 4.2.7)
|
||||
activerecord (= 4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.4)
|
||||
railties (= 4.2.7)
|
||||
sprockets-rails
|
||||
rails-assets-jquery (2.1.4)
|
||||
rails-assets-lodash (3.10.1)
|
||||
rails-assets-jquery (3.1.0)
|
||||
rails-assets-lodash (4.14.1)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.7)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
rails_12factor (0.0.3)
|
||||
rails_serve_static_assets
|
||||
rails_stdout_logging
|
||||
rails_best_practices (1.15.7)
|
||||
rails_best_practices (1.17.0)
|
||||
activesupport
|
||||
code_analyzer (>= 0.4.3)
|
||||
colored
|
||||
erubis
|
||||
i18n
|
||||
json
|
||||
require_all
|
||||
ruby-progressbar
|
||||
rails_serve_static_assets (0.0.4)
|
||||
rails_stdout_logging (0.0.4)
|
||||
railties (4.2.4)
|
||||
actionpack (= 4.2.4)
|
||||
activesupport (= 4.2.4)
|
||||
rails_serve_static_assets (0.0.5)
|
||||
rails_stdout_logging (0.0.5)
|
||||
railties (4.2.7)
|
||||
actionpack (= 4.2.7)
|
||||
activesupport (= 4.2.7)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
rake (10.4.2)
|
||||
rainbow (2.1.0)
|
||||
rake (11.2.2)
|
||||
redcard (1.1.0)
|
||||
reek (2.2.1)
|
||||
parser (~> 2.2)
|
||||
rainbow (~> 2.0)
|
||||
unparser (~> 0.2.2)
|
||||
require_all (1.3.3)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
rest-client (1.8.0)
|
||||
responders (2.2.0)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rest-client (2.0.0)
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
roodi (3.3.1)
|
||||
ruby_parser (~> 3.2, >= 3.2.2)
|
||||
rspec (3.4.0)
|
||||
rspec-core (~> 3.4.0)
|
||||
rspec-expectations (~> 3.4.0)
|
||||
rspec-mocks (~> 3.4.0)
|
||||
rspec-core (3.4.1)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-expectations (3.4.0)
|
||||
rspec (3.5.0)
|
||||
rspec-core (~> 3.5.0)
|
||||
rspec-expectations (~> 3.5.0)
|
||||
rspec-mocks (~> 3.5.0)
|
||||
rspec-core (3.5.2)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-expectations (3.5.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-mocks (3.4.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-mocks (3.5.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-rails (3.4.0)
|
||||
actionpack (>= 3.0, < 4.3)
|
||||
activesupport (>= 3.0, < 4.3)
|
||||
railties (>= 3.0, < 4.3)
|
||||
rspec-core (~> 3.4.0)
|
||||
rspec-expectations (~> 3.4.0)
|
||||
rspec-mocks (~> 3.4.0)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-support (3.4.1)
|
||||
ruby-progressbar (1.7.5)
|
||||
ruby_parser (3.7.2)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-rails (3.5.1)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.5.0)
|
||||
rspec-expectations (~> 3.5.0)
|
||||
rspec-mocks (~> 3.5.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-support (3.5.0)
|
||||
ruby-progressbar (1.8.1)
|
||||
ruby_parser (3.8.2)
|
||||
sexp_processor (~> 4.1)
|
||||
rubyzip (1.1.7)
|
||||
sass (3.4.19)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
rubyzip (1.2.0)
|
||||
sass (3.4.22)
|
||||
sass-rails (5.0.6)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
selenium-webdriver (2.48.1)
|
||||
selenium-webdriver (2.53.4)
|
||||
childprocess (~> 0.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
sexp_processor (4.6.0)
|
||||
simplecov (0.10.0)
|
||||
sexp_processor (4.7.0)
|
||||
simplecov (0.12.0)
|
||||
docile (~> 1.1.0)
|
||||
json (~> 1.8)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.0)
|
||||
slop (3.6.0)
|
||||
sprockets (3.4.0)
|
||||
sprockets (3.7.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (3.1.1)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
tilt (2.0.1)
|
||||
tilt (2.0.5)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.2)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
uglifier (3.0.1)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.1)
|
||||
unparser (0.2.4)
|
||||
unf_ext (0.0.7.2)
|
||||
unparser (0.2.5)
|
||||
abstract_type (~> 0.0.7)
|
||||
adamantium (~> 0.2.0)
|
||||
concord (~> 0.1.5)
|
||||
diff-lcs (~> 1.2.5)
|
||||
equalizer (~> 0.0.9)
|
||||
parser (~> 2.2.2)
|
||||
parser (~> 2.3.0)
|
||||
procto (~> 0.0.2)
|
||||
warden (1.2.3)
|
||||
warden (1.2.6)
|
||||
rack (>= 1.0)
|
||||
websocket (1.2.2)
|
||||
websocket (1.2.3)
|
||||
xpath (2.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
|
|
@ -359,7 +365,7 @@ DEPENDENCIES
|
|||
ng-rails-csrf
|
||||
pry
|
||||
rack-cors
|
||||
rails (= 4.2.4)
|
||||
rails (= 4.2.7)
|
||||
rails-assets-jquery!
|
||||
rails-assets-lodash!
|
||||
rails_12factor
|
||||
|
|
@ -372,5 +378,8 @@ DEPENDENCIES
|
|||
sprockets
|
||||
uglifier
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.3.1p112
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.6
|
||||
1.12.5
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
class Regimen
|
||||
include Mongoid::Document
|
||||
field :color, in: Sequence::COLORS
|
||||
field :name
|
||||
embeds_many :regimen_items
|
||||
end
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
class RegimenItem
|
||||
include Mongoid::Document
|
||||
field :offset, type: Integer
|
||||
has_one :schedule
|
||||
end
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Api::SchedulesController do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe 'Bot authentication' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::DevicesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#create' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::DevicesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#destroy' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::DevicesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#show' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::DevicesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ require 'spec_helper'
|
|||
# settings. Consumed by the Angular SPA on the front end.
|
||||
describe Api::DevicesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#update' do
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Api::SchedulesController do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#create' do
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Api::SchedulesController do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#destroy' do
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Api::SchedulesController do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#index' do
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Api::SchedulesController do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#update' do
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::SequencesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#create' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::SequencesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#destroy' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::SequencesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#index' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::SequencesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#show' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::SequencesController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#update' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::StepsController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#create' do
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::StepsController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#destroy' do
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::StepsController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#index' do
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Api::StepsController do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#show' do
|
||||
let(:sequence) { FactoryGirl.create(:sequence, device: user.device) }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::StepsController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#update' do
|
||||
let(:sequence) { FactoryGirl.create(:sequence, device: user.device) }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::TokensController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#create' do
|
||||
let(:user) { FactoryGirl.create(:user, password: "password") }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
|||
|
||||
describe Api::UsersController do
|
||||
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
describe '#create' do
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
FactoryGirl.define do
|
||||
factory :regiman, :class => 'Regimen' do
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
FactoryGirl.define do
|
||||
factory :regimen_item do
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,23 +1,23 @@
|
|||
require 'spec_helper'
|
||||
|
||||
xdescribe 'User Registration' do
|
||||
it 'creates a new user account' do
|
||||
visit root_path
|
||||
fill_in 'user_name', with: 'ricky_ricardo'
|
||||
fill_in 'user_password', with: 'password123'
|
||||
fill_in 'user_email', with: 'test@test.com'
|
||||
fill_in 'user_password_confirmation', with: 'password123'
|
||||
click_button 'Sign Up'
|
||||
expect(page).to have_content 'Welcome! You have signed up successfully.'
|
||||
expect(User.find_by(email: 'test@test.com')).to be
|
||||
end
|
||||
# xdescribe 'User Registration' do
|
||||
# it 'creates a new user account' do
|
||||
# visit root_path
|
||||
# fill_in 'user_name', with: 'ricky_ricardo'
|
||||
# fill_in 'user_password', with: 'password123'
|
||||
# fill_in 'user_email', with: 'test@test.com'
|
||||
# fill_in 'user_password_confirmation', with: 'password123'
|
||||
# click_button 'Sign Up'
|
||||
# expect(page).to have_content 'Welcome! You have signed up successfully.'
|
||||
# expect(User.find_by(email: 'test@test.com')).to be
|
||||
# end
|
||||
|
||||
it 'requires a user name' do
|
||||
visit root_path
|
||||
fill_in 'user_password', with: 'password123'
|
||||
fill_in 'user_email', with: 'test@test.com'
|
||||
fill_in 'user_password_confirmation', with: 'password123'
|
||||
click_button 'Sign Up'
|
||||
expect(page).to have_content "Name can't be blank"
|
||||
end
|
||||
end
|
||||
# it 'requires a user name' do
|
||||
# visit root_path
|
||||
# fill_in 'user_password', with: 'password123'
|
||||
# fill_in 'user_email', with: 'test@test.com'
|
||||
# fill_in 'user_password_confirmation', with: 'password123'
|
||||
# click_button 'Sign Up'
|
||||
# expect(page).to have_content "Name can't be blank"
|
||||
# end
|
||||
# end
|
||||
|
|
|
|||
|
|
@ -1,32 +1,32 @@
|
|||
require 'spec_helper'
|
||||
|
||||
xdescribe 'User Session' do
|
||||
it 'logs the user in' do
|
||||
user = FactoryGirl.create(:user)
|
||||
visit new_user_session_path
|
||||
fill_in 'user_email', with: user.email
|
||||
fill_in 'user_password', with: user.password
|
||||
click_button 'Sign in'
|
||||
expect(page).to have_content('Signed in successfully.')
|
||||
end
|
||||
# xdescribe 'User Session' do
|
||||
# it 'logs the user in' do
|
||||
# user = FactoryGirl.create(:user)
|
||||
# visit new_user_session_path
|
||||
# fill_in 'user_email', with: user.email
|
||||
# fill_in 'user_password', with: user.password
|
||||
# click_button 'Sign in'
|
||||
# expect(page).to have_content('Signed in successfully.')
|
||||
# end
|
||||
|
||||
it 'edits user settings', js: true do
|
||||
user = FactoryGirl.create(:user)
|
||||
sign_in_as user
|
||||
visit edit_user_registration_path
|
||||
old_email = user.email
|
||||
new_email = Faker::Internet.email
|
||||
fill_in 'user_email', with: new_email
|
||||
fill_in 'user_current_password', with: user.password
|
||||
click_button 'Update'
|
||||
expect(page).to have_content('Your account has been updated successfully.')
|
||||
expect(user.reload.email).to eq(new_email)
|
||||
end
|
||||
# it 'edits user settings', js: true do
|
||||
# user = FactoryGirl.create(:user)
|
||||
# sign_in_as user
|
||||
# visit edit_user_registration_path
|
||||
# old_email = user.email
|
||||
# new_email = Faker::Internet.email
|
||||
# fill_in 'user_email', with: new_email
|
||||
# fill_in 'user_current_password', with: user.password
|
||||
# click_button 'Update'
|
||||
# expect(page).to have_content('Your account has been updated successfully.')
|
||||
# expect(user.reload.email).to eq(new_email)
|
||||
# end
|
||||
|
||||
it 'logs the user out' do
|
||||
user = FactoryGirl.create(:user)
|
||||
sign_in_as(user)
|
||||
click_link 'Sign out'
|
||||
expect(page).to have_content('Signed out successfully.')
|
||||
end
|
||||
end
|
||||
# it 'logs the user out' do
|
||||
# user = FactoryGirl.create(:user)
|
||||
# sign_in_as(user)
|
||||
# click_link 'Sign out'
|
||||
# expect(page).to have_content('Signed out successfully.')
|
||||
# end
|
||||
# end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe KeyGen do
|
||||
it 'generates a key' do
|
||||
file = Tempfile.new('foo')
|
||||
result = KeyGen.generate_new_key(file)
|
||||
expect(result.to_pem).to eq(file.read)
|
||||
file.close
|
||||
file.unlink
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# require 'rails_helper'
|
||||
|
||||
# RSpec.describe RegimenItem, type: :model do
|
||||
# pending "add some examples to (or delete) #{__FILE__}"
|
||||
# end
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# require 'rails_helper'
|
||||
|
||||
# RSpec.describe Regimen, type: :model do
|
||||
# pending "add some examples to (or delete) #{__FILE__}"
|
||||
# end
|
||||
Loading…
Reference in New Issue