Skip to content

Commit

Permalink
update nokogiri
Browse files Browse the repository at this point in the history
  • Loading branch information
lsat12357 committed Jan 24, 2018
1 parent d40683b commit 6a60de6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ gem 'sparql-client'

gem 'noid'
gem 'hybag'
gem 'qa', :github => "terrellt/questioning_authority", :branch => "feature/od-fixes"
gem 'qa', :github => "oregondigital/questioning_authority", :branch => "fix/update_nokogiri"

gem 'resque', '~>1.25.0'

Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ GIT
faraday_middleware

GIT
remote: git://github.com/terrellt/questioning_authority.git
revision: e54fa1e8079faa80e3e178e4184edff154756674
branch: feature/od-fixes
remote: git://github.com/oregondigital/questioning_authority.git
revision: 44bf7155ce3e5fb56c8643a1fcd6b737341b97e0
branch: fix/update_nokogiri
specs:
qa (0.0.3)
activerecord-import (>= 0.4.0)
deprecation
nokogiri (~> 1.6.0)
nokogiri (~> 1.8.1)
rails (~> 4.0)
rest-client

Expand Down Expand Up @@ -336,7 +336,7 @@ GEM
mime-types (1.25.1)
mini_magick (3.7.0)
subexec (~> 0.2.1)
mini_portile2 (2.1.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
mongo (1.9.2)
bson (~> 1.9.2)
Expand All @@ -357,8 +357,8 @@ GEM
netrc (0.7.7)
newrelic_rpm (3.7.3.204)
noid (0.7.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nom-xml (0.5.1)
activesupport
i18n
Expand Down
11 changes: 9 additions & 2 deletions docker/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,15 @@ fi
target=${@:-spec/}
# Run tests!
echo "Running 'bundle exec rspec $target'"
$dctest run --rm test $target

if [ $@ ]; then
$dctest run --rm test $@
else
for specdir in spec/*; do
if [ -d $specdir ]; then
$dctest run --rm test $specdir
fi
done
fi
if [[ $quick == 0 ]]; then
$dctest stop
else
Expand Down

0 comments on commit 6a60de6

Please sign in to comment.