lentil 0.9.1 → 1.0.0

data/test/functional/admin/tags_controller_test.rb

@@ -9,8 +9,8 @@ class AdminTagsControllerTest < ActionController::TestCase
   end
 
   test "should get to images index" do
-    get :index, :use_route => :lentil
+    get :index
     assert_response :success
   end
 
-end
+end

data/test/functional/admin/tagsets_controller_test.rb

@@ -9,13 +9,13 @@ class AdminTagsetsControllerTest < ActionController::TestCase
   end
 
   test "should get to tagset index" do
-    get :index, :use_route => :lentil
+    get :index
     assert_response :success
   end
 
   test "should get to tagset show" do
-    get :show, :id => lentil_tagsets(:one), :use_route => :lentil
+    get :show, :id => lentil_tagsets(:one)
     assert_response :success
   end
 
-end
+end

data/test/functional/admin/users_controller_test.rb

@@ -9,8 +9,8 @@ class AdminUsersControllerTest < ActionController::TestCase
   end
 
   test "should get to images index" do
-    get :index, :use_route => :lentil
+    get :index
     assert_response :success
   end
 
-end
+end

data/test/functional/lentil/flags_controller_test.rb

@@ -4,15 +4,16 @@ class Lentil::FlagsControllerTest < ActionController::TestCase
 
   setup do
     @request.env['HTTP_REFERER'] = '/'
+    @routes = Lentil::Engine.routes
   end
 
   test "should post tally" do
-    post :tally, :image_id => lentil_images(:one).id, :use_route => :lentil
+    post :tally, :image_id => lentil_images(:one).id
     assert_response 302
   end
 
   test "should save image id in session when posting a tally" do
-    post :tally, :image_id => lentil_images(:one).id, :use_route => :lentil
+    post :tally, :image_id => lentil_images(:one).id
     assert session["flagged_images"].include?(lentil_images(:one).id.to_s)
   end
 

data/test/functional/lentil/images_controller_test.rb

@@ -1,55 +1,59 @@
 require 'test_helper'
 
 class Lentil::ImagesControllerTest < ActionController::TestCase
+  def setup
+    @routes = Lentil::Engine.routes
+  end
+
   test "should get index" do
-    get :index, :use_route => :lentil
+    get :index
     assert_response :success
     assert assigns(:images)
   end
 
   test "should get show" do
-    get :show, :id => lentil_images(:one).id, :use_route => :lentil
+    get :show, :id => lentil_images(:one).id
     assert_response :success
   end
 
   test "should get recent" do
-    get :recent, :use_route => :lentil
+    get :recent
     assert_response :success
   end
 
   test "should get popular" do
-    get :popular, :use_route => :lentil
+    get :popular
     assert_response :success
   end
 
   test "should get staff picks" do
-    get :staff_picks, :use_route => :lentil
+    get :staff_picks
     assert_response :success
     assert_equal(lentil_images(:one), assigns(:images).first)
   end
 
   test "should get rss feed for index" do
-    get :index, :use_route => :lentil, :format => :rss
+    get :index, :format => :rss
     assert_response :success
   end
 
   test "should get atom feed for index" do
-    get :index, :use_route => :lentil, :format => :atom
+    get :index, :format => :atom
     assert_response :success
   end
 
   test "should get an animated view of all images" do
-    get :animate, :use_route => :lentil
+    get :animate
     assert_response :success
   end
 
   test "should get an animated view of staff pick images" do
-    get :staff_picks_animate, :use_route => :lentil
+    get :staff_picks_animate
     assert_response :success
   end
 
   test "should get a tiled view for iframe" do
-    get :iframe, :use_route => :lentil
+    get :iframe
     assert_response :success
   end
 

data/test/functional/lentil/like_votes_controller_test.rb

@@ -4,15 +4,16 @@ class Lentil::LikeVotesControllerTest < ActionController::TestCase
 
   setup do
     @request.env['HTTP_REFERER'] = '/'
+    @routes = Lentil::Engine.routes
   end
 
   test "should post tally" do
-    post :tally, :image_id => lentil_images(:one).id, :use_route => :lentil
+    post :tally, :image_id => lentil_images(:one).id
     assert_response 302
   end
 
   test "should save image id in session when posting a tally" do
-    post :tally, :image_id => lentil_images(:one).id, :use_route => :lentil
+    post :tally, :image_id => lentil_images(:one).id
     assert session["liked_images"].include?(lentil_images(:one).id.to_s)
   end
 

data/test/functional/lentil/photographers_controller_test.rb

@@ -1,13 +1,17 @@
 require 'test_helper'
 
 class Lentil::PhotographersControllerTest < ActionController::TestCase
+  def setup
+    @routes = Lentil::Engine.routes
+  end
+
   test "should get index" do
-    get :index, :use_route => :lentil
+    get :index
     assert_response :success
   end
 
   test "should get show view" do
-    get :show, :id => lentil_users(:bd).id, :use_route => :lentil
+    get :show, :id => lentil_users(:bd).id
     assert_response :success
   end
 

data/test/functional/lentil/thisorthat_controller_test.rb

@@ -1,8 +1,12 @@
 require 'test_helper'
 
 class Lentil::ThisorthatControllerTest < ActionController::TestCase
+  def setup
+    @routes = Lentil::Engine.routes
+  end
+
   test "should get battle leaders" do
-    get :battle_leaders, :use_route => :lentil
+    get :battle_leaders
     assert_response :success
   end
 

data/test/integration/lentil/javascript/event_tracking_test.rb

@@ -13,7 +13,7 @@ class EventTrackingTest < ActionDispatch::IntegrationTest
   test "should trigger an event for clicking on an image" do
   	visit(lentil.images_path)
     find("#image_#{@image.id} a.fancybox").click
-    assert_equal("_trackEvent,image,click,image_#{@image.id}", console_messages[-2][:message])
+    assert_equal("_trackEvent,image,click,image_#{@image.id}", console_messages[-2])
     assert_equal("_trackPageview,/lentil/images/#{@image.id}", console_message)
   end
 
@@ -46,10 +46,11 @@ class EventTrackingTest < ActionDispatch::IntegrationTest
   # end
 
   test "should trigger an event for liking and unliking an image" do
-    visit lentil.image_path(@image)
+    visit(lentil.image_path(@image))
     find('.like-btn.initial-state', :visible => true).click
     assert_equal("_trackEvent,image_view,like,#{@image.id}", console_message)
     find('.like-btn.already-clicked', :visible => true).click
+    find('.like-btn.initial-state', :visible => true)
     assert_equal("_trackEvent,image_view,unlike,#{@image.id}", console_message)
   end
 

data/test/integration/lentil/thisorthat_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ThisorthatTest < ActionDispatch::IntegrationTest
 
   test "should be able to pick winners" do
-    VCR.use_cassette('battle_images', :record => :new_episodes) do
+    VCR.use_cassette('battle_images') do
       visit(lentil.thisorthat_battle_path)
 
       battle_images = all('form .battle-image-wrap')

data/test/test_helper.rb

@@ -3,25 +3,22 @@ SimpleCov.start 'rails'
 
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
+require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
+require 'rails/test_help'
 require 'capybara/rails'
 require 'pry'
 require 'mocha/setup'
-require 'webmock/test_unit'
+require 'webmock/minitest'
 require 'database_cleaner'
-require 'capybara-webkit'
+require 'capybara/poltergeist'
 
 Rails.backtrace_cleaner.remove_silencers!
+ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end
-ActiveSupport::TestCase.fixtures :all
+Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Transactional fixtures do not work with Selenium tests, because Capybara
 # uses a separate server thread, which the transactions would be hidden
@@ -31,7 +28,14 @@ DatabaseCleaner.strategy = :truncation
 if ActionDispatch::IntegrationTest.method_defined?(:fixture_path=)
   ActionDispatch::IntegrationTest.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.respond_to?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end
+
 class ActionDispatch::IntegrationTest
+  fixtures :all
 
   # Make the Capybara DSL available in all integration tests
   include Capybara::DSL
@@ -40,20 +44,24 @@ class ActionDispatch::IntegrationTest
   self.use_transactional_fixtures = false
 
   def setup
+    Capybara.register_driver :poltergeist_with_logger do |app|
+      Capybara::Poltergeist::Driver.new(app, phantomjs_logger: StringIO.new)
+    end
+
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.start
   end
 
   def login_admin_user
-    user = lentil_admin_users(:one)
     visit admin_root_path
     fill_in 'Email', with: 'admin@example.com'
     fill_in 'Password', with: 'password'
-    click_on 'Log in'
+    click_on 'Login'
+    true
   end
 
   def browser_start
-    Capybara.current_driver = :webkit #_with_long_timeout
+    Capybara.current_driver = :poltergeist_with_logger
     Capybara.default_wait_time = 30
   end
 
@@ -61,17 +69,17 @@ class ActionDispatch::IntegrationTest
     Capybara.use_default_driver
   end
 
-  def console_message
-    page.driver.console_messages.last[:message]
+  def console_messages
+    page.driver.phantomjs_logger.string.split
   end
 
-  def console_messages
-    page.driver.console_messages
+  def console_message
+    self.console_messages.last
   end
 
   teardown do
-    DatabaseCleaner.clean       # Truncate the database
     Capybara.reset_sessions!    # Forget the (simulated) browser state
+    DatabaseCleaner.clean       # Truncate the database
     Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
   end
 end
@@ -79,6 +87,11 @@ end
 # For functional tests that require authentication
 class ActionController::TestCase
   include Devise::TestHelpers
+  fixtures :all
+end
+
+class ActiveSupport::TestCase
+  fixtures :all
 end
 
 require 'vcr'

data/test/unit/lentil/user_test.rb

@@ -23,7 +23,7 @@ class UserTest < ActiveSupport::TestCase
   test "username should be unique for a given service" do
     user = lentil_users(:jr)
 
-    assert_false user.service.users.build(:user_name => user.user_name).valid?,
+    assert !user.service.users.build(:user_name => user.user_name).valid?,
       "username and service should collectively unique"
     assert lentil_services(:flickr).users.build(:user_name => user.user_name).valid?,
       "duplicate usernames are allowed if they are associated with different services"