Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ group :development do
end

group :development, :test do
gem "capybara", "~> 2.6"
gem "coveralls", "~> 0.7", require: false
gem "faker", "~> 1.2"
gem "pry-byebug", "~> 1.2"
gem "rack-test", "~> 1.1"
gem "rspec", "~> 3.4"
gem "rspec-html-matchers", "~> 0.7"
gem "shotgun", "~> 0.9"
gem "capybara"
gem "coveralls", "> 0.8", require: false
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not remove the version constraint here, too?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because there is some recoverable conflict in dependencies. If it's not specified to be greater than 0.8 it installs a 0.7.2 (if I recall correctly) from 2014, and it doesn't support all the features implemented in the code base.

It's selected (or so I believe) because that was the last version that doesn't have a dependency on an older version of another gem we use.

gem "faker"
gem "pry-byebug"
gem "rack-test"
gem "rspec"
gem "rspec-html-matchers"
gem "shotgun"
gem "simplecov"
gem "timecop", "~> 0.8"
gem "timecop"
end

gem "activerecord", "~> 5.0"
Expand Down
130 changes: 65 additions & 65 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,40 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
ast (2.4.2)
backports (3.6.8)
bcrypt (3.1.11)
byebug (2.7.0)
columnize (~> 0.3)
debugger-linecache (~> 1.2)
capybara (2.6.2)
byebug (11.1.3)
capybara (3.35.3)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
coderay (1.1.1)
columnize (0.9.0)
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
coderay (1.1.3)
concurrent-ruby (1.1.8)
coveralls (0.8.13)
json (~> 1.8)
simplecov (~> 0.11.0)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
crass (1.0.5)
debugger-linecache (1.2.0)
delayed_job (4.1.9)
activesupport (>= 3.0, < 6.2)
delayed_job_active_record (4.1.5)
activerecord (>= 3.0, < 6.2)
delayed_job (>= 3.0, < 5)
diff-lcs (1.2.5)
docile (1.1.5)
docile (1.3.5)
execjs (2.7.0)
faker (1.6.3)
i18n (~> 0.5)
faker (2.16.0)
i18n (>= 1.6, < 2)
feedbag (0.9.5)
nokogiri (~> 1.0)
feedjira (3.1.2)
Expand All @@ -56,36 +54,37 @@ GEM
httparty (0.18.1)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (0.9.5)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
json (1.8.6)
json (2.5.1)
kgio (2.11.2)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.8.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.14.4)
multi_json (1.14.1)
multi_xml (0.6.0)
mustermann (1.0.3)
nokogiri (1.11.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (1.3.3)
byebug (~> 2.7)
pry (~> 0.10)
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.6)
racc (1.5.2)
rack (2.2.3)
rack-protection (2.0.7)
Expand All @@ -102,22 +101,22 @@ GEM
rake (12.3.3)
regexp_parser (2.1.1)
rexml (3.2.4)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.4)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-html-matchers (0.7.1)
rspec-support (~> 3.10.0)
rspec-html-matchers (0.9.4)
nokogiri (~> 1)
rspec (>= 3.0.0.a, < 4)
rspec-mocks (3.4.1)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
rubocop (1.10.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
Expand All @@ -132,13 +131,13 @@ GEM
ruby-progressbar (1.11.0)
sass (3.4.22)
sax-machine (1.3.2)
shotgun (0.9.1)
shotgun (0.9.2)
rack (>= 1.0)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
simplecov-html (0.10.2)
sinatra (2.0.7)
mustermann (~> 1.0)
rack (~> 2.0)
Expand All @@ -156,21 +155,22 @@ GEM
tilt (~> 2.0)
sinatra-flash (0.3.0)
sinatra (>= 1.0.0)
slop (3.6.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-helpers (1.2.1)
sprockets (>= 2.2)
sqlite3 (1.4.2)
term-ansicolor (1.3.2)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (0.19.1)
thor (1.1.0)
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.10)
timecop (0.8.0)
tins (1.6.0)
timecop (0.9.4)
tins (1.28.0)
sync
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (3.0.2)
Expand All @@ -180,38 +180,38 @@ GEM
kgio (~> 2.6)
raindrops (~> 0.7)
will_paginate (3.1.0)
xpath (2.0.0)
nokogiri (~> 1.3)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
activerecord (~> 5.0)
bcrypt (~> 3.1)
capybara (~> 2.6)
coveralls (~> 0.7)
capybara
coveralls (> 0.8)
delayed_job (~> 4.1)
delayed_job_active_record (~> 4.1)
faker (~> 1.2)
faker
feedbag (~> 0.9.5)
feedjira (~> 3.0)
httparty
i18n
loofah (~> 2.3)
nokogiri (~> 1.11)
pg (~> 0.18.4)
pry-byebug (~> 1.2)
pry-byebug
rack-protection (~> 2.0)
rack-ssl (~> 1.4)
rack-test (~> 1.1)
rack-test
racksh (~> 1.0)
rake (~> 12.3)
rspec (~> 3.4)
rspec-html-matchers (~> 0.7)
rspec
rspec-html-matchers
rubocop
sass
shotgun (~> 0.9)
shotgun
simplecov
sinatra (~> 2.0)
sinatra-activerecord (~> 2.0)
Expand All @@ -221,7 +221,7 @@ DEPENDENCIES
sprockets-helpers
sqlite3
thread (~> 0.2)
timecop (~> 0.8)
timecop
uglifier
unicorn (~> 5.3)
will_paginate (~> 3.1)
Expand Down
2 changes: 0 additions & 2 deletions spec/integration/feed_importing_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
require "time"
require "support/active_record"
require "support/feed_server"
require "capybara"
require "capybara/server"
require "timecop"

app_require "tasks/fetch_feed"
Expand Down
4 changes: 2 additions & 2 deletions spec/models/story_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
describe "Story" do
let(:story) do
Story.new(
title: Faker::Lorem.sentence(50),
body: Faker::Lorem.sentence(50)
title: Faker::Lorem.sentence(word_count: 50),
body: Faker::Lorem.sentence(word_count: 50)
)
end

Expand Down
4 changes: 4 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ENV["RACK_ENV"] = "test"

require "capybara"
require "capybara/server"
require "rspec"
require "rspec-html-matchers"
require "rack/test"
Expand All @@ -13,6 +15,8 @@

require "./app"

Capybara.server = :webrick

RSpec.configure do |config|
config.include Rack::Test::Methods
config.include RSpecHtmlMatchers
Expand Down