Adding integration tests

simonc · simonc · commit 6ce6515245d3 · 2015-03-01T21:29:14.000+01:00
* Removing Ruby 1.9.3 since it's now dead * Adding multiple gemfiles to test different Rails versions * DRYing the rspec_helper require (move it to .rspec) Closes #174.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,6 @@ pkg
 coverage
 Gemfile.lock
 .rvmrc
+capybara-*
+gemfiles/*.lock
+log
diff --git a/.rspec b/.rspec
@@ -1,2 +1,3 @@
 --color
 --format=documentation
+--require spec_helper
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,12 @@
+before_install:
+  - gem install bundler
+
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.5
+  - 2.2.0
+
+gemfile:
+  - gemfiles/rails-4-2-stable.gemfile
+  - gemfiles/rails-4-1-stable.gemfile
+  - gemfiles/rails-3-2-stable.gemfile
diff --git a/Guardfile b/Guardfile
@@ -1,5 +1,7 @@
 guard :rspec, all_after_pass: true, failed_mode: :none do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^spec/fake_app/.+\.rb$}) { 'spec/integration' }
+
   watch('spec/spec_helper.rb')  { 'spec' }
 end
diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_JOBS: 4
diff --git a/gemfiles/rails-3-2-stable.gemfile b/gemfiles/rails-3-2-stable.gemfile
@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 3.2.0'
+gem 'rspec-rails', '~> 3.2.1'
+
+if RUBY_VERSION >= '2.2.0'
+  gem 'test-unit', '~> 3.0'
+end
+
+gemspec path: '../'
diff --git a/gemfiles/rails-4-1-stable.gemfile b/gemfiles/rails-4-1-stable.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 4.1.0'
+gem 'rspec-rails', '~> 3.2.1'
+
+gemspec path: '../'
diff --git a/gemfiles/rails-4-2-stable.gemfile b/gemfiles/rails-4-2-stable.gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'launchy'
+gem 'railties', '~> 4.2.0'
+gem 'rspec-rails', '~> 3.2.1'
+
+gemspec path: '../'
diff --git a/lib/simple_navigation/item.rb b/lib/simple_navigation/item.rb
@@ -149,7 +149,7 @@ def selected_by_autohighlight?
     end
 
     def autohighlight_by_subpath?
-      SimpleNavigation.config.highlight_on_subpath && selected_by_subpath?
+      config.highlight_on_subpath && selected_by_subpath?
     end
 
     def selected_by_highlights_on?
diff --git a/simple-navigation.gemspec b/simple-navigation.gemspec
@@ -29,12 +29,13 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '>= 2.3.2'
 
-  spec.add_development_dependency 'actionpack', '>= 2.3.2'
   spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'coveralls', '~> 0.7'
   spec.add_development_dependency 'guard-rspec', '~> 4.2'
   spec.add_development_dependency 'memfs', '~> 0.4.1'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rdoc'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'tzinfo', '>= 0'
 end
diff --git a/spec/fake_app/config/navigation.rb b/spec/fake_app/config/navigation.rb
@@ -0,0 +1,6 @@
+SimpleNavigation::Configuration.run do |navigation|
+  navigation.items do |nav|
+    nav.item :item_1, 'Item 1', '/item_1'
+    nav.item :item_2, 'Item 2', '/item_2'
+  end
+end
diff --git a/spec/fake_app/rails_app.rb b/spec/fake_app/rails_app.rb
@@ -0,0 +1,35 @@
+ENV['RAILS_ENV'] ||= 'test'
+
+require 'action_controller/railtie'
+require 'simple_navigation'
+
+module RailsApp
+  class Application < Rails::Application
+    config.active_support.deprecation = :log
+    config.cache_classes = true
+    config.eager_load = false
+    config.root = __dir__
+    config.secret_token = 'x'*100
+    config.session_store :cookie_store, key: '_myapp_session'
+  end
+
+  class TestsController < ActionController::Base
+    def base
+      render inline: <<-END
+        <!DOCTYPE html>
+        <html>
+          <body>
+            <%= render_navigation %>
+          </body>
+        </html>
+      END
+    end
+  end
+end
+
+Rails.backtrace_cleaner.remove_silencers!
+RailsApp::Application.initialize!
+
+RailsApp::Application.routes.draw do
+  get '/base_spec' => 'rails_app/tests#base'
+end
diff --git a/spec/initializers/coveralls.rb b/spec/initializers/coveralls.rb
@@ -0,0 +1,3 @@
+require 'coveralls'
+
+Coveralls.wear!
diff --git a/spec/initializers/rails.rb b/spec/initializers/rails.rb
@@ -0,0 +1,4 @@
+begin
+  require 'rails'
+rescue LoadError
+end
diff --git a/spec/initializers/rspec.rb b/spec/initializers/rspec.rb
@@ -0,0 +1,7 @@
+RSpec.configure do |config|
+  config.expect_with(:rspec) do |c|
+    c.syntax = :expect
+  end
+
+  config.order = :random
+end
diff --git a/spec/integration/rendering_navigation_spec.rb b/spec/integration/rendering_navigation_spec.rb
@@ -0,0 +1,12 @@
+RSpec.feature 'Rendering navigation' do
+  background do
+    SimpleNavigation.set_env(RailsApp::Application.root, 'test')
+  end
+
+  scenario 'Rendering basic navigation', type: :feature do
+    visit '/base_spec'
+
+    expect(page).to have_content('Item 1')
+    expect(page).to have_content('Item 2')
+  end
+end
diff --git a/spec/simple_navigation/adapters/padrino_spec.rb b/spec/simple_navigation/adapters/padrino_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Adapters
     describe Padrino do
diff --git a/spec/simple_navigation/adapters/rails_spec.rb b/spec/simple_navigation/adapters/rails_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Adapters
     describe Rails do
@@ -15,7 +13,8 @@ module Adapters
         before { allow(action_controller).to receive(:include) }
 
         it 'calls set_env' do
-          expect(simple_navigation).to receive(:set_env).with('./', 'test')
+          app_path = RailsApp::Application.root
+          expect(simple_navigation).to receive(:set_env).with(app_path, 'test')
           simple_navigation.register
         end
 
diff --git a/spec/simple_navigation/adapters/sinatra_spec.rb b/spec/simple_navigation/adapters/sinatra_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe SimpleNavigation::Adapters::Sinatra do
   let(:adapter) { SimpleNavigation::Adapters::Sinatra.new(context) }
   let(:context) { double(:context) }
diff --git a/spec/simple_navigation/config_file_finder_spec.rb b/spec/simple_navigation/config_file_finder_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'fileutils'
 require 'simple_navigation/config_file_finder'
 
diff --git a/spec/simple_navigation/configuration_spec.rb b/spec/simple_navigation/configuration_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   describe Configuration do
     subject(:config) { Configuration.instance }
diff --git a/spec/simple_navigation/helpers_spec.rb b/spec/simple_navigation/helpers_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   describe Helpers do
     subject(:controller) { test_controller_class.new }
diff --git a/spec/simple_navigation/item_adapter_spec.rb b/spec/simple_navigation/item_adapter_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   describe ItemAdapter do
     let(:item_adapter) { ItemAdapter.new(item) }
diff --git a/spec/simple_navigation/item_container_spec.rb b/spec/simple_navigation/item_container_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   describe ItemContainer do
     subject(:item_container) { ItemContainer.new }
diff --git a/spec/simple_navigation/item_spec.rb b/spec/simple_navigation/item_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   describe Item do
     let!(:item_container) { ItemContainer.new }
diff --git a/spec/simple_navigation/items_provider_spec.rb b/spec/simple_navigation/items_provider_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   describe ItemsProvider do
     let(:items_provider) { ItemsProvider.new(provider) }
diff --git a/spec/simple_navigation/renderer/base_spec.rb b/spec/simple_navigation/renderer/base_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Renderer
     describe Base do
diff --git a/spec/simple_navigation/renderer/breadcrumbs_spec.rb b/spec/simple_navigation/renderer/breadcrumbs_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Renderer
     describe Breadcrumbs do
diff --git a/spec/simple_navigation/renderer/json_spec.rb b/spec/simple_navigation/renderer/json_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Renderer
     describe Json do
diff --git a/spec/simple_navigation/renderer/links_spec.rb b/spec/simple_navigation/renderer/links_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Renderer
     describe Links do
diff --git a/spec/simple_navigation/renderer/list_spec.rb b/spec/simple_navigation/renderer/list_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Renderer
     describe List do
diff --git a/spec/simple_navigation/renderer/text_spec.rb b/spec/simple_navigation/renderer/text_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module SimpleNavigation
   module Renderer
     describe Text do
diff --git a/spec/simple_navigation_spec.rb b/spec/simple_navigation_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe SimpleNavigation do
   before { subject.config_file_path = 'path_to_config' }
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,34 +1,27 @@
 require 'initializers/have_css_matcher'
 require 'initializers/memfs'
-require 'action_controller'
-require 'coveralls'
-require 'action_view'
+require 'initializers/coveralls'
+require 'initializers/rails'
+require 'initializers/rspec'
+require 'capybara/rspec'
 
-Coveralls.wear!
+require 'bundler/setup'
+Bundler.require
 
-RSpec.configure do |config|
-  config.expect_with(:rspec) { |c| c.syntax = :expect }
-  config.order = :random
+if defined? Rails
+  require 'fake_app/rails_app'
+  require 'rspec/rails'
 
-  config.before do
-    SimpleNavigation.config_files.clear
-    setup_adapter_for :rails
-  end
-end
+  Capybara.app = RailsApp::Application
 
-unless defined?(Rails)
-  module ::Rails
-    def self.root; './'; end
-    def self.env; 'test'; end
-
-    class Railtie
-      def self.initializer(*args); end
+  RSpec.configure do |config|
+    config.before do
+      SimpleNavigation.config_files.clear
+      setup_adapter_for :rails
     end
   end
 end
 
-require 'simple_navigation'
-
 def setup_adapter_for(framework, context = double(:context))
   if framework == :rails
     allow(context).to receive_messages(view_context: ActionView::Base.new)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`--color`
`2`	`2`	`--format=documentation`
	`3`	`+--require spec_helper`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+require 'coveralls'`
	`2`	`+`
	`3`	`+Coveralls.wear!`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`module SimpleNavigation`
`4`	`2`	`module Adapters`
`5`	`3`	`describe Padrino do`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`describe SimpleNavigation::Adapters::Sinatra do`
`4`	`2`	`let(:adapter) { SimpleNavigation::Adapters::Sinatra.new(context) }`
`5`	`3`	`let(:context) { double(:context) }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`	`1`	`require 'fileutils'`
`3`	`2`	`require 'simple_navigation/config_file_finder'`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require 'spec_helper'`
`2`		`-`
`3`	`1`	`describe SimpleNavigation do`
`4`	`2`	`before { subject.config_file_path = 'path_to_config' }`
`5`	`3`