Skip to content

Commit

Permalink
Gemspec and rails test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bramjetten
Bramjetten committed Jul 12, 2016
1 parent a8250bd commit 21f54aa
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 104 deletions.
3 changes: 2 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ gemspec
group :development, :test do
gem 'gem-release'
gem 'pg'
gem 'quiet_assets'
gem 'letter_opener'
gem 'brakeman'
gem 'globalize', github: 'globalize/globalize'
gem 'spina-template', github: 'denkGroot/Spina-template'
gem 'rails-controller-testing'
gem 'bcrypt'
gem 'minitest-reporters'
gem 'guard'
Expand Down
196 changes: 97 additions & 99 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,66 +9,83 @@ GIT
jquery-fileupload-rails
neat (~> 1.5)

GIT
remote: git://github.com/globalize/globalize.git
revision: 113326efaf6b7aadef5317580b897ed381346ec0
specs:
globalize (5.1.0)
activemodel (>= 4.2, < 5.1)
activerecord (>= 4.2, < 5.1)
request_store (~> 1.0)

PATH
remote: .
specs:
spina (0.9.0)
activemodel-serializers-xml
ancestry
bcrypt
breadcrumbs_on_rails
cancancan
carrierwave
coffee-rails
filters_spam
globalize (~> 5.0.0)
globalize
haml-rails
jquery-fileupload-rails
jquery-rails
kaminari
mini_magick
rack-rewrite (~> 1.5.0)
rails (>= 4.0)
rails (>= 5.0)
sass-rails
spina-template
turbolinks (~> 5.0.0.beta)
turbolinks (~> 5.0.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
actioncable (5.0.0)
actionpack (= 5.0.0)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0)
actionpack (= 5.0.0)
actionview (= 5.0.0)
activejob (= 5.0.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
actionpack (5.0.0)
actionview (= 5.0.0)
activesupport (= 5.0.0)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5)
activesupport (= 4.2.5)
actionview (5.0.0)
activesupport (= 5.0.0)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
globalid (>= 0.3.0)
activemodel (4.2.5)
activesupport (= 4.2.5)
activejob (5.0.0)
activesupport (= 5.0.0)
globalid (>= 0.3.6)
activemodel (5.0.0)
activesupport (= 5.0.0)
activemodel-serializers-xml (1.0.1)
activemodel (> 5.x)
activerecord (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
arel (~> 6.0)
activesupport (4.2.5)
activerecord (5.0.0)
activemodel (= 5.0.0)
activesupport (= 5.0.0)
arel (~> 7.0)
activesupport (5.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
ancestry (2.1.0)
Expand All @@ -78,23 +95,12 @@ GEM
bundler
rake
thor (>= 0.14.0)
arel (6.0.3)
bcrypt (3.1.10)
arel (7.0.0)
bcrypt (3.1.11)
bourbon (3.2.4)
sass (~> 3.2)
thor
brakeman (3.1.4)
erubis (~> 2.6)
fastercsv (~> 1.5)
haml (>= 3.0, < 5.0)
highline (>= 1.6.20, < 2.0)
multi_json (~> 1.2)
ruby2ruby (>= 2.1.1, < 2.3.0)
ruby_parser (~> 3.7.0)
safe_yaml (>= 1.0)
sass (~> 3.0)
slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
brakeman (3.3.2)
breadcrumbs_on_rails (2.3.1)
builder (3.2.2)
cancancan (1.15.0)
Expand All @@ -106,9 +112,9 @@ GEM
mimemagic (>= 0.3.0)
celluloid (0.16.0)
timers (~> 4.0.0)
codeclimate-test-reporter (0.4.8)
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.0)
coderay (1.1.1)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
Expand All @@ -120,7 +126,6 @@ GEM
docile (1.1.5)
erubis (2.7.0)
execjs (2.7.0)
fastercsv (1.5.5)
ffi (1.9.14)
figaro (1.1.1)
thor (~> 0.14)
Expand All @@ -133,20 +138,17 @@ GEM
gem-release (0.7.4)
globalid (0.3.6)
activesupport (>= 4.1.0)
globalize (5.0.1)
activemodel (>= 4.2.0, < 4.3)
activerecord (>= 4.2.0, < 4.3)
guard (2.13.0)
guard (2.14.0)
formatador (>= 0.2.4)
listen (>= 2.7, <= 4.0)
listen (>= 2.7, < 4.0)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.4)
guard-minitest (2.4.5)
guard-compat (~> 1.2)
minitest (>= 3.0)
haml (4.0.7)
Expand All @@ -157,7 +159,6 @@ GEM
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
highline (1.7.8)
hitimes (1.2.4)
html2haml (2.0.0)
erubis (~> 2.7.0)
Expand Down Expand Up @@ -198,106 +199,102 @@ GEM
mini_magick (4.5.1)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest-reporters (1.1.7)
minitest-reporters (1.1.10)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.11.2)
neat (1.8.0)
sass (>= 3.3)
thor (~> 0.19)
nenv (0.2.0)
nenv (0.3.0)
nio4r (1.2.1)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.0.8)
notiffany (0.1.0)
nenv (~> 0.1)
shellany (~> 0.0)
pg (0.18.4)
pkg-config (1.1.7)
pry (0.10.3)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack (2.0.1)
rack-rewrite (1.5.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
rails (5.0.0)
actioncable (= 5.0.0)
actionmailer (= 5.0.0)
actionpack (= 5.0.0)
actionview (= 5.0.0)
activejob (= 5.0.0)
activemodel (= 5.0.0)
activerecord (= 5.0.0)
activesupport (= 5.0.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
railties (= 5.0.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (0.1.1)
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.1)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
railties (5.0.0)
actionpack (= 5.0.0)
activesupport (= 5.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.2.2)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
ruby-progressbar (1.7.5)
ruby2ruby (2.2.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.7.2)
request_store (1.3.1)
ruby-progressbar (1.8.1)
ruby_parser (3.8.2)
sexp_processor (~> 4.1)
safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass-rails (5.0.5)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sexp_processor (4.6.0)
sexp_processor (4.7.0)
shellany (0.0.1)
simplecov (0.11.1)
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)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
sprockets (3.6.1)
sprockets (3.6.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.7.6)
terminal-table (1.5.2)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tilt (2.0.5)
timers (4.0.4)
hitimes
turbolinks (5.0.0)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby
Expand All @@ -309,12 +306,13 @@ DEPENDENCIES
codeclimate-test-reporter
figaro
gem-release
globalize!
guard
guard-minitest
letter_opener
minitest-reporters
pg
quiet_assets
rails-controller-testing
spina!
spina-template!

Expand Down
7 changes: 4 additions & 3 deletions spina.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.files = Dir['{app,config,db,lib}/**/*'] + ['Rakefile', 'README.md']
# s.test_files = Dir['test/**/*']

s.add_dependency 'rails', '>= 4.0'
s.add_dependency 'rails', '>= 5.0'
s.add_dependency 'bcrypt'
s.add_dependency 'haml-rails'
s.add_dependency 'sass-rails'
Expand All @@ -31,8 +31,9 @@ Gem::Specification.new do |s|
s.add_dependency 'ancestry'
s.add_dependency 'breadcrumbs_on_rails'
s.add_dependency 'spina-template'
s.add_dependency 'turbolinks', '~> 5.0.0.beta'
s.add_dependency 'turbolinks', '~> 5.0.0'
s.add_dependency 'kaminari'
s.add_dependency 'globalize', '> 5.0.0'
s.add_dependency 'globalize'
s.add_dependency 'activemodel-serializers-xml'
s.add_dependency 'rack-rewrite', '~> 1.5.0'
end
2 changes: 1 addition & 1 deletion test/integration/spina/admin/login_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class LoginTest < ActionDispatch::IntegrationTest
assert_response :success

post_via_redirect "/admin/sessions", email: spina_users(:bram).email, password: "password"
assert_equal '/admin', path
assert_equal '/admin/pages', path

get "/admin/pages"
assert_response :success
Expand Down

0 comments on commit 21f54aa

Please sign in to comment.