summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-11-20 11:58:09 -0800
committerjessib <jessib@leap.se>2012-11-20 11:58:09 -0800
commit80cd2489d87a523663d92776de55fa7fda2ecb99 (patch)
tree44e27ecffb66bc590de67a187954ba8ac96a9ede
parent9289ae6601cacb746f83f9bd9d953d0591eac0da (diff)
parentcd743d686ade50a9b23965a99c57b8105e834ec9 (diff)
Merge branch 'develop' into help_develop
-rw-r--r--INSTALL.md6
-rw-r--r--certs/app/controllers/certs_controller.rb2
-rw-r--r--certs/test/functional/certs_controller_test.rb7
-rw-r--r--certs/test/test_helper.rb2
-rw-r--r--common_dependencies.rb2
-rw-r--r--test/test_helper.rb2
-rw-r--r--users/test/test_helper.rb2
7 files changed, 16 insertions, 7 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 18d9c6d..1323a41 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -6,11 +6,11 @@ The webapp only depends on very basic ruby packages and installs the other requi
### Packages ###
-For now we are using ruby 1.8.7. The following packages need to be installed:
+The following packages need to be installed:
* git
-* ruby1.8
-* rubygems1.8
+* ruby (1.8.7 and 1.9.3 work)
+* rubygems
* couchdb
### Gems ###
diff --git a/certs/app/controllers/certs_controller.rb b/certs/app/controllers/certs_controller.rb
index 6988a38..402bef3 100644
--- a/certs/app/controllers/certs_controller.rb
+++ b/certs/app/controllers/certs_controller.rb
@@ -1,5 +1,7 @@
class CertsController < ApplicationController
+ before_filter :authorize
+
# GET /cert
def show
@cert = Cert.pick_from_pool
diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb
index 295515b..9bba8c0 100644
--- a/certs/test/functional/certs_controller_test.rb
+++ b/certs/test/functional/certs_controller_test.rb
@@ -4,7 +4,14 @@ class CertsControllerTest < ActionController::TestCase
setup do
end
+ test "should require login" do
+ get :show
+ assert_response :redirect
+ assert_redirected_to login_url
+ end
+
test "should send cert" do
+ login
cert = stub :zipped => "adsf", :zipname => "cert_stub.zip"
Cert.expects(:pick_from_pool).returns(cert)
get :show
diff --git a/certs/test/test_helper.rb b/certs/test/test_helper.rb
index 08d4d41..f6b4eb8 100644
--- a/certs/test/test_helper.rb
+++ b/certs/test/test_helper.rb
@@ -1,7 +1,7 @@
ENV["RAILS_ENV"] = "test"
require File.expand_path('../../../test/dummy/config/environment', __FILE__)
require 'rails/test_help'
-require 'mocha'
+require 'mocha/setup'
Rails.backtrace_cleaner.remove_silencers!
diff --git a/common_dependencies.rb b/common_dependencies.rb
index 5312a80..a6691cf 100644
--- a/common_dependencies.rb
+++ b/common_dependencies.rb
@@ -1,6 +1,6 @@
source "http://rubygems.org"
group :test do
- gem 'mocha', :require => false
+ gem 'mocha', '~> 0.13.0', :require => false
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 50d5159..0016771 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test"
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
-require 'mocha'
+require 'mocha/setup'
# Load support files from all engines
Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f }
diff --git a/users/test/test_helper.rb b/users/test/test_helper.rb
index e8f0125..52dff53 100644
--- a/users/test/test_helper.rb
+++ b/users/test/test_helper.rb
@@ -1,7 +1,7 @@
ENV["RAILS_ENV"] = "test"
require File.expand_path('../../../test/dummy/config/environment', __FILE__)
require 'rails/test_help'
-require 'mocha'
+require 'mocha/setup'
Rails.backtrace_cleaner.remove_silencers!