Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Bundle update (and fix spec that started failing)

Browse source
This commit is contained in:
wvengen 2015-01-14 21:20:14 +01:00
parent 118886344a
commit c31d015434
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Gemfile.lock
View file

@ -77,7 +77,7 @@ GEM
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
arel (6.0.0) arel (6.0.0)
attribute_normalizer (1.2.0) attribute_normalizer (1.2.0)
better_errors (2.1.0) better_errors (2.1.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubis (>= 2.6.6)
rack (>= 0.9.0) rack (>= 0.9.0)
@ -131,7 +131,7 @@ GEM
term-ansicolor term-ansicolor
thor thor
daemons (1.1.9) daemons (1.1.9)
database_cleaner (1.3.0) database_cleaner (1.4.0)
date_time_attribute (0.1.2) date_time_attribute (0.1.2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
@ -162,7 +162,7 @@ GEM
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
haml (4.1.0.beta.1) haml (4.1.0.beta.1)
tilt tilt
haml-rails (0.6.0) haml-rails (0.7.0)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
activesupport (>= 4.0.1) activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0) haml (>= 3.1, < 5.0)
@ -187,7 +187,7 @@ GEM
rails-dom-testing (~> 1.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.2)
kaminari (0.16.1) kaminari (0.16.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -218,13 +218,13 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (2.4.3) mime-types (2.4.3)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.5.0) minitest (5.5.1)
mono_logger (1.1.0) mono_logger (1.1.0)
multi_json (1.10.1) multi_json (1.10.1)
mysql2 (0.3.17) mysql2 (0.3.17)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.9.1) net-ssh (2.9.2)
netrc (0.10.2) netrc (0.10.2)
nokogiri (1.6.5) nokogiri (1.6.5)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
@ -255,7 +255,7 @@ GEM
rack (>= 0.9.1) rack (>= 0.9.1)
rack-protection (1.5.3) rack-protection (1.5.3)
rack rack
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.0) rails (4.2.0)
actionmailer (= 4.2.0) actionmailer (= 4.2.0)
@ -289,7 +289,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.4.2) rake (10.4.2)
ransack (1.5.1) ransack (1.6.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -324,7 +324,7 @@ GEM
rspec-core (2.99.2) rspec-core (2.99.2)
rspec-expectations (2.99.2) rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.2) rspec-mocks (2.99.3)
rspec-rails (2.99.0) rspec-rails (2.99.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0) activemodel (>= 3.0)
@ -414,7 +414,7 @@ GEM
railties (>= 3.1) railties (>= 3.1)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.6.1) uglifier (2.7.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
uniform_notifier (1.6.2) uniform_notifier (1.6.2)

1
spec/models/article_spec.rb
View file

@ -85,6 +85,7 @@ describe Article do
it 'does not need to synchronise an imported article' do it 'does not need to synchronise an imported article' do
article = shared_article.build_new_article(supplier) article = shared_article.build_new_article(supplier)
article.article_category = create :article_category
expect(article.shared_article_changed?).to be_falsey expect(article.shared_article_changed?).to be_falsey
end end