Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6913aac
fixing gem bug, creating rspec folder and creating db migration to co…
Odeane Jun 24, 2020
c1720bd
installing Rspec, creating a database, updating migration version, ap…
Alex-Bellamy Jun 24, 2020
76f7174
created a specfolder and updated the db migration version to 4.2 and …
Jun 24, 2020
2583dc9
login functionality - adding test to ensure Login button is present a…
Alex-Bellamy Jun 24, 2020
2368b8d
wrote teo new tests for log in feature, first i changed root_path to …
Jun 24, 2020
62fbc43
writing test for redirecting efter log in
Jun 25, 2020
d3d1558
updated README
Jun 25, 2020
83b73b6
testing setup
Odeane Jun 25, 2020
d909ed5
setting up factor bot, adding shoulder matcher
Odeane Jun 25, 2020
02562d0
Merge branch 'log_in_feature' of https://github.com/Odeane/legacy_cod…
Alex-Bellamy Jun 25, 2020
e637ffb
amending Factorybot password to enable tests to pass
Alex-Bellamy Jun 25, 2020
a38bda3
rewrote test to actually display that the login was succsessful
Jun 25, 2020
4dab8ae
sad path for not entering or entering incorrect password
Odeane Jun 25, 2020
b2da6c7
adding coveralls
Odeane Jun 25, 2020
a26d06c
adding test to find Inbox link
Odeane Jun 25, 2020
70495cf
changed ruby version 2.5.1 and created another test where user can cl…
Jun 25, 2020
4ac1393
resolving formatting
Odeane Jun 25, 2020
c531703
adding spec to test for sending mesage and recieving sucessfully sent…
Odeane Jun 26, 2020
b52ec74
added Warden in rspec config to help write test for send message and …
Jun 27, 2020
c7ad300
changed branch name
Jun 28, 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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
!/log/.keep
/tmp
.byebug_history

.coverage/

# OSX files
.DS_Store
Expand Down
3 changes: 3 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--require spec_helper
--format documentation
--color
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.3
2.5.1
12 changes: 10 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.4.3'
ruby '2.5.1'

gem 'rails', '5.1.5'

Expand All @@ -17,11 +17,19 @@ gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'

group :development do
gem 'pry-byebug'
gem 'spring'
gem 'web-console', '~> 2.0'
end

group :development, :test do
gem 'rspec-rails'
gem 'shoulda-matchers'
gem 'capybara'
gem 'factory_bot_rails'
gem 'pry-byebug'
gem 'coveralls', require: false
end

group :production do
gem 'rails_12factor'
end
Expand Down
208 changes: 141 additions & 67 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,86 +38,114 @@ GEM
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (8.0.0)
autoprefixer-rails (8.6.4)
autoprefixer-rails (9.8.4)
execjs
bcrypt (3.1.12)
bcrypt (3.1.13)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.3)
byebug (10.0.2)
carrierwave (1.2.3)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
chosen-rails (1.8.3)
sassc (>= 2.0.0)
builder (3.2.4)
byebug (11.1.3)
capybara (3.33.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
carrierwave (2.1.0)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
mimemagic (>= 0.3.0)
mini_mime (>= 0.1.3)
chosen-rails (1.9.0)
coffee-rails (>= 3.2)
railties (>= 3.0)
sass-rails (>= 3.2)
coderay (1.1.2)
sassc-rails (>= 2.1.2)
coderay (1.1.3)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
concurrent-ruby (1.1.6)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
crass (1.0.6)
debug_inspector (0.0.3)
devise (4.4.3)
devise (4.7.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
erubi (1.7.1)
diff-lcs (1.4.2)
docile (1.3.2)
erubi (1.9.0)
execjs (2.7.0)
ffi (1.9.25)
globalid (0.4.1)
factory_bot (6.0.2)
activesupport (>= 5.0.0)
factory_bot_rails (6.0.0)
factory_bot (~> 6.0.0)
railties (>= 5.0.0)
ffi (1.13.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
image_processing (1.11.0)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
jbuilder (2.10.0)
activesupport (>= 5.0.0)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
loofah (2.2.2)
json (2.3.0)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
mailboxer (0.15.1)
carrierwave (>= 0.5.8)
rails (>= 5.0.0)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
nio4r (2.3.1)
nokogiri (1.8.3)
mini_portile2 (~> 2.3.0)
method_source (1.0.0)
mimemagic (0.3.5)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.1)
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (0.21.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
puma (3.11.4)
rack (2.0.5)
rack-test (1.0.0)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
public_suffix (4.0.5)
puma (3.12.6)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.5)
actioncable (= 5.1.5)
Expand Down Expand Up @@ -148,13 +176,33 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.3.0)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
sass (3.5.6)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.7.1)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (4.0.1)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.9)
rspec-expectations (~> 3.9)
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
ruby-vips (2.0.17)
ffi (~> 1.9)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -165,43 +213,67 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
spring (2.0.2)
activesupport (>= 4.2)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
shoulda-matchers (4.3.0)
activesupport (>= 4.2.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.1.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.1.1)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
tilt (2.0.10)
tins (1.25.0)
sync
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (4.1.14)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
warden (1.2.8)
rack (>= 2.0.6)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass
capybara
chosen-rails
coveralls
devise
factory_bot_rails
jbuilder (~> 2.0)
jquery-rails
loofah (~> 2.2.1)
Expand All @@ -213,15 +285,17 @@ DEPENDENCIES
rails-html-sanitizer (~> 1.0.4)
rails_12factor
rake (~> 11.1, >= 11.1.2)
rspec-rails
sass-rails (~> 5.0)
shoulda-matchers
spring
sprockets (~> 3.7.2)
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.4.3p205
ruby 2.5.1p57

BUNDLED WITH
1.16.1
1.17.3
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## CA Mailboxer 2018

Code base for week 5 challenge - Working with legacy code
Code base for week 5 challenge - Working with legacy code...
3 changes: 2 additions & 1 deletion app/views/conversations/_messages.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<%= message.sender.name %> <br>
<small><b>Subject: </b><%= message.subject %></small><br>
<small><b>Date: </b><%= message.created_at.strftime("%A, %b %d, %Y at %I:%M%p") %></small>

</h4>
<%= message.body %>
<%= message.body %>
</div>
</div>
<% end %>
5 changes: 5 additions & 0 deletions coverage/.last_run.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"result": {
"covered_percent": 78.67
}
}
Loading