add rails 4 support, closes #7

goshacmd · Jul 3, 2013 · 3532b9b · 3532b9b
1 parent 6f4f4f1
commit 3532b9b
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 83 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    nsa_panel (0.0.6)
-      rails (~> 3.2.12)
+    nsa_panel (0.1.0)
+      rails (>= 3.2.12, < 5)
 
 GEM
   remote: http://rubygems.org/

diff --git a/Rakefile b/Rakefile
@@ -23,18 +23,4 @@ end
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
diff --git a/lib/nsa_panel/version.rb b/lib/nsa_panel/version.rb
@@ -1,3 +1,3 @@
 module NsaPanel
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end
diff --git a/nsa_panel.gemspec b/nsa_panel.gemspec
@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", "~> 3.2.12"
-  # s.add_dependency "jquery-rails"
+  s.add_dependency "rails", ">= 3.2.12", "< 5"
 
   s.add_development_dependency "sqlite3"
 end
diff --git a/test/functional/nsa_panel/dashboard_controller_test.rb b/test/functional/nsa_panel/dashboard_controller_test.rb
diff --git a/test/functional/nsa_panel/data_controller_test.rb b/test/functional/nsa_panel/data_controller_test.rb
diff --git a/test/integration/navigation_test.rb b/test/integration/navigation_test.rb
diff --git a/test/nsa_panel_test.rb b/test/nsa_panel_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
diff --git a/test/unit/helpers/nsa_panel/dashboard_helper_test.rb b/test/unit/helpers/nsa_panel/dashboard_helper_test.rb
diff --git a/test/unit/helpers/nsa_panel/data_helper_test.rb b/test/unit/helpers/nsa_panel/data_helper_test.rb