Skip to content

Commit

Permalink
Support Rails 4.2, bump rspec version and fix specs
Browse files Browse the repository at this point in the history
Signed-off-by: Clemens Gruber <[email protected]>
  • Loading branch information
clemensg committed Dec 24, 2014
1 parent cf950cb commit a740bc4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion spec/lib/base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
end

context "custom" do
let(:custom_column) { stub(:custom, value: "AN EMAIL") }
let(:custom_column) { double(:custom, value: "AN EMAIL") }

it '.column can take a custom column' do
subject.column :email, using: custom_column
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/column_jury_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require "spec_helper"

describe TableCloth::ColumnJury do
let(:dummy_table) { stub(:table, admin?: true, moderator?: false) }
let(:dummy_table) { double(:table, admin?: true, moderator?: false) }

subject { TableCloth::ColumnJury.new(column, dummy_table) }

Expand Down Expand Up @@ -32,4 +32,4 @@
end
end
end
end
end
3 changes: 2 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
require 'factory_girl'
require 'pry'
require 'simplecov'
require 'rspec/collection_matchers'

if ENV["COVERAGE"] == "true"
SimpleCov.start do
Expand All @@ -22,4 +23,4 @@
config.run_all_when_everything_filtered = true
config.filter_run :focus
config.include ElementHelpers
end
end
7 changes: 4 additions & 3 deletions table_cloth.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]

gem.add_development_dependency('rspec', '~> 2.11')
gem.add_development_dependency('rspec', '~> 2.99.0')
gem.add_development_dependency('rspec-collection_matchers')
gem.add_development_dependency('simplecov')
gem.add_development_dependency('awesome_print')
gem.add_development_dependency('nokogiri')
Expand All @@ -27,6 +28,6 @@ Gem::Specification.new do |gem|
gem.add_development_dependency('rake')
gem.add_development_dependency('rb-fsevent', '~> 0.9.4')

gem.add_dependency('actionpack', '>= 3.1', '< 4.2')
gem.add_dependency('element_factory', '~> 0.1.2')
gem.add_dependency('actionpack', '>= 3.1', '< 5.0')
gem.add_dependency('element_factory', '~> 0.1.3')
end

0 comments on commit a740bc4

Please sign in to comment.