Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

6 files changed, 8 insertions, 18 deletions

diff --git a/certs/Gemfile b/certs/Gemfile
index 9028024..951d1b7 100644
--- a/certs/Gemfile
+++ b/certs/Gemfile
@@ -1,17 +1,14 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in leap_web_certs.gemspec.
+eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb'))
+
+# We require leap_web_core from here so we can use the path option.
+gem "leap_web_core", :path => '../core'
+
+# Declare your gem's dependencies in leap_web_users.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
 # To use debugger
 # gem 'ruby-debug'
diff --git a/certs/leap_web_certs.gemspec b/certs/leap_web_certs.gemspec
index 14708df..15a45be 100644
--- a/certs/leap_web_certs.gemspec
+++ b/certs/leap_web_certs.gemspec
@@ -15,9 +15,6 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", "~> 3.2.8"
   s.add_dependency "leap_web_core", LeapWeb::VERSION
-  
-  s.add_development_dependency "mocha"
 
 end
diff --git a/certs/lib/leap_web_certs/engine.rb b/certs/lib/leap_web_certs/engine.rb
index 7dbc572..3c8948a 100644
--- a/certs/lib/leap_web_certs/engine.rb
+++ b/certs/lib/leap_web_certs/engine.rb
@@ -1,4 +1,3 @@
-# thou shall require all your dependencies in an engine.
 require "leap_web_core"
 
 module LeapWebCerts
diff --git a/certs/lib/leap_web_certs/version.rb b/certs/lib/leap_web_certs/version.rb
deleted file mode 100644
index 800ca0b..0000000
--- a/certs/lib/leap_web_certs/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebCerts
-  VERSION = "0.0.4"
-end
diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb
index 04669f5..295515b 100644
--- a/certs/test/functional/certs_controller_test.rb
+++ b/certs/test/functional/certs_controller_test.rb
@@ -10,6 +10,5 @@ class CertsControllerTest < ActionController::TestCase
     get :show
     assert_response :success
     assert_equal cert.zipped, @response.body
-    assert_attachement_filename "cert_stub.zip"
   end
 end
diff --git a/certs/test/unit/cert_test.rb b/certs/test/unit/cert_test.rb
index 21ef169..9362da2 100644
--- a/certs/test/unit/cert_test.rb
+++ b/certs/test/unit/cert_test.rb
@@ -17,8 +17,9 @@ class CertTest < ActiveSupport::TestCase
   end
 
   test "cert.zipped returns the actual data" do
-    @sample.save # This is required!
+    @sample.save # This is required !
     assert lines = @sample.zipped.split("\n")
+    assert_equal 56, lines.count
     assert_equal "-----BEGIN RSA PRIVATE KEY-----", lines.first.chomp
     assert_equal "-----END CERTIFICATE-----", lines.last.chomp
   end