From e05a1b0f5ae40a2aa17976b3009cd563b8e4660a Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 1 May 2016 10:55:33 -0300
Subject: api: allow version bumping - bump to 2

---
 test/functional/api/smtp_certs_controller_test.rb | 43 +++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 test/functional/api/smtp_certs_controller_test.rb

(limited to 'test/functional/api/smtp_certs_controller_test.rb')

diff --git a/test/functional/api/smtp_certs_controller_test.rb b/test/functional/api/smtp_certs_controller_test.rb
new file mode 100644
index 0000000..2142675
--- /dev/null
+++ b/test/functional/api/smtp_certs_controller_test.rb
@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class Api::SmtpCertsControllerTest < ActionController::TestCase
+
+  test "no smtp cert without login" do
+    with_config allow_anonymous_certs: true do
+      post :create
+      assert_login_required
+    end
+  end
+
+  test "require service level with email" do
+    login
+    post :create
+    assert_access_denied
+  end
+
+  test "send cert with username" do
+    login effective_service_level: ServiceLevel.new(id: 2)
+    cert = expect_cert(@current_user.email_address)
+    cert.expects(:fingerprint).returns('fingerprint')
+    post :create
+    assert_response :success
+    assert_equal cert.to_s, @response.body
+  end
+
+  test "fail to create cert when disabled" do
+    login :enabled? => false
+    post :create
+    assert_access_denied
+  end
+
+  protected
+
+  def expect_cert(email)
+    cert = stub to_s: "#{email.downcase} cert",
+      expiry: 1.month.from_now.utc.at_midnight
+    ClientCertificate.expects(:new).
+      with(:common_name => email).
+      returns(cert)
+    return cert
+  end
+end
-- 
cgit v1.2.3


From e542a3056c27fd662ef767b6720861035f6dbb1c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 18 May 2016 21:00:42 +0200
Subject: api: set defaults for version in routes

This way we do not need to specify it all the times.

In the functional tests defaults do not get added automatically.
Introduced api_{get,put,post,delete} to add format and version default.

One to two functional tests failing, everything else passes.
---
 test/functional/api/smtp_certs_controller_test.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/functional/api/smtp_certs_controller_test.rb')

diff --git a/test/functional/api/smtp_certs_controller_test.rb b/test/functional/api/smtp_certs_controller_test.rb
index 2142675..393f090 100644
--- a/test/functional/api/smtp_certs_controller_test.rb
+++ b/test/functional/api/smtp_certs_controller_test.rb
@@ -1,17 +1,17 @@
 require 'test_helper'
 
-class Api::SmtpCertsControllerTest < ActionController::TestCase
+class Api::SmtpCertsControllerTest < ApiControllerTest
 
   test "no smtp cert without login" do
     with_config allow_anonymous_certs: true do
-      post :create
+      api_post :create
       assert_login_required
     end
   end
 
   test "require service level with email" do
     login
-    post :create
+    api_post :create
     assert_access_denied
   end
 
@@ -19,14 +19,14 @@ class Api::SmtpCertsControllerTest < ActionController::TestCase
     login effective_service_level: ServiceLevel.new(id: 2)
     cert = expect_cert(@current_user.email_address)
     cert.expects(:fingerprint).returns('fingerprint')
-    post :create
+    api_post :create
     assert_response :success
     assert_equal cert.to_s, @response.body
   end
 
   test "fail to create cert when disabled" do
     login :enabled? => false
-    post :create
+    api_post :create
     assert_access_denied
   end
 
-- 
cgit v1.2.3