Skip to content

Commit

Permalink
making sure kaninari is required in tests, and fix controller spec
Browse files Browse the repository at this point in the history
  • Loading branch information
mbulat committed Jul 10, 2017
1 parent ccea409 commit 66f06fd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
13 changes: 13 additions & 0 deletions fixture_rails_root/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ PATH
plutus (0.12.2)
jquery-rails (>= 3.0)
jquery-ui-rails (>= 4.2.2)
kaminari (~> 1.0)
rails (> 4.0)

GEM
Expand Down Expand Up @@ -73,6 +74,18 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
kaminari (1.0.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
kaminari-activerecord (= 1.0.1)
kaminari-core (= 1.0.1)
kaminari-actionview (1.0.1)
actionview
kaminari-core (= 1.0.1)
kaminari-activerecord (1.0.1)
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand Down
2 changes: 1 addition & 1 deletion plutus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency("rails", "> 4.0")
s.add_dependency("jquery-rails", ">= 3.0")
s.add_dependency("jquery-ui-rails", ">= 4.2.2")
s.add_dependency("kaminari")
s.add_dependency("kaminari", "~> 1.0")
s.add_development_dependency("yard")
s.files = Dir["{app,config,db,lib}/**/*"] + ["LICENSE", "Rakefile", "README.markdown"]
s.homepage = %q{http://github.com/mbulat/plutus}
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/entries_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def mock_entry(stubs={})

describe "GET index" do
it "assigns all entries as @entries" do
Entry.stub_chain(:limit, :order).and_return([mock_entry])
Entry.stub_chain(:per, :order).and_return([mock_entry])
get :index
assigns[:entries].should == [mock_entry]
end
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

$: << File.expand_path(File.dirname(__FILE__) + '/../lib/')
require 'plutus'
require 'kaminari'

Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}

Expand Down

0 comments on commit 66f06fd

Please sign in to comment.