bsm_oa 0.3.1 → 0.4.0

data/lib/bsm_oa/version.rb

@@ -1,3 +1,3 @@
 module BsmOa
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/controllers/bsm_oa/accounts_controller_spec.rb

@@ -1,35 +1,38 @@
 require 'spec_helper'
 
 describe BsmOa::AccountsController, type: :controller do
+  include Rack::Test::Methods
 
   let(:authorization) { create :authorization }
   let(:application)   { authorization.application }
   let(:user)          { create :user, roles: [authorization.role] }
   let(:access_token)  { Doorkeeper::AccessToken.create! resource_owner_id: user.id, application_id: application.id }
+  let(:app)           { Rails.application }
 
-  describe 'routing' do
-    it { is_expected.to route(:get, "/me").to(action: :show) }
+  describe 'GET show.json (successful)' do
+    before do
+      get "/me.json", {client_id: application.uid, client_secret: application.secret}, {"HTTP_AUTHORIZATION" => "Bearer #{access_token.token}"}
+    end
+
+    it { expect(last_response.status).to eq(200) }
+    it { expect(last_response.headers).to include("Content-Type" => "application/json; charset=utf-8") }
   end
 
-  describe 'GET show.json (successful)' do
+  describe 'GET show.json (expired)' do
     before do
-      request.headers["Authorization"] = "Bearer #{access_token.token}"
-      get :show, client_id: application.uid, client_secret: application.secret, format: 'json'
+      access_token.update_column :resource_owner_id, 0
+      get "/me.json", {client_id: application.uid, client_secret: application.secret}, {"HTTP_AUTHORIZATION" => "Bearer #{access_token.token}"}
     end
 
-    it { expect(response.body).to have_json_size(3) }
-    it { expect(response.body).to have_json_size(1).at_path('authorizations') }
-    it { expect(response.body).to have_json_size(2).at_path('authorizations/0') }
-    it { is_expected.to respond_with(:success) }
+    it { expect(last_response.status).to eq(403) }
   end
 
   describe 'GET show.json (bad auth token)' do
     before do
-      request.headers["Authorization"] = "Bearer abcdef"
-      get :show, format: 'json'
+      get "/me.json", {client_id: application.uid, client_secret: application.secret}, {"HTTP_AUTHORIZATION" => "Bearer abcdef"}
     end
 
-    it { is_expected.to respond_with(:unauthorized) }
+    it { expect(last_response.status).to eq(401) }
   end
 
 end

data/spec/controllers/bsm_oa/applications_controller_spec.rb

@@ -6,12 +6,12 @@ describe BsmOa::ApplicationsController, type: :controller do
   let(:application) { create :application }
 
   describe 'routing' do
-    it { is_expected.to route(:get,  "/oauth/applications").to(action: :index) }
-    it { is_expected.to route(:post, "/oauth/applications").to(action: :create) }
-    it { is_expected.to route(:get,  "/oauth/applications/new").to(action: :new) }
-    it { is_expected.to route(:get,  "/oauth/applications/1").to(action: :show, id: 1) }
-    it { is_expected.to route(:put,  "/oauth/applications/1").to(action: :update, id: 1) }
-    it { is_expected.to route(:delete, "/oauth/applications/1").to(action: :destroy, id: 1) }
+    it { is_expected.to route(:get,     "/applications")      .to(action: :index) }
+    it { is_expected.to route(:post,    "/applications")      .to(action: :create) }
+    it { is_expected.to route(:get,     "/applications/new")  .to(action: :new) }
+    it { is_expected.to route(:get,     "/applications/1")    .to(action: :show, id: 1) }
+    it { is_expected.to route(:put,     "/applications/1")    .to(action: :update, id: 1) }
+    it { is_expected.to route(:delete,  "/applications/1")    .to(action: :destroy, id: 1) }
   end
 
   describe 'GET index.json' do
@@ -20,84 +20,78 @@ describe BsmOa::ApplicationsController, type: :controller do
       get :index, format: 'json'
     end
 
-    it { expect(response.body).to have_json_size(1) }
     it { is_expected.to respond_with(:success) }
   end
 
   describe 'GET show.json' do
     before do
-      get :show, format: 'json', id: application.to_param
+      get :show, params: {format: 'json', id: application.to_param}
     end
 
-    it { expect(response.body).to have_json_size(6) }
     it { is_expected.to respond_with(:success) }
   end
 
   describe 'GET show.html' do
     before do
-      get :show, format: 'html', id: application.to_param
+      get :show, params: {format: 'html', id: application.to_param}
     end
 
-    it { is_expected.to redirect_to("http://test.host/oauth/applications") }
+    it { is_expected.to respond_with(:success) }
   end
 
   describe 'POST create.json (successful)' do
     before do
-      post :create, format: 'json', doorkeeper_application: attributes_for(:application)
+      post :create, params: {format: 'json', bsm_oa_application: attributes_for(:application)}
     end
 
-    it { expect(response.body).to have_json_size(6) }
-    it { is_expected.to respond_with(:success) }
+    it { is_expected.to respond_with(:created) }
   end
 
   describe 'POST create.json (unsuccessful)' do
     before do
-      post :create, format: 'json', doorkeeper_application: attributes_for(:application, name: nil)
+      post :create, params: {format: 'json', bsm_oa_application: attributes_for(:application, name: nil)}
     end
 
-    it { expect(response.body).to have_json_path('errors') }
     it { is_expected.to respond_with(:unprocessable_entity) }
   end
 
   describe 'POST create.html' do
     before do
-      post :create, doorkeeper_application: attributes_for(:application)
+      post :create, params: {bsm_oa_application: attributes_for(:application)}
     end
 
     it { is_expected.to respond_with(:redirect) }
-    it { is_expected.to redirect_to("http://test.host/oauth/applications/#{Doorkeeper::Application.last.to_param}") }
+    it { is_expected.to redirect_to("http://test.host/applications/#{BsmOa::Application.last.to_param}") }
   end
 
   describe 'PUT update.json (successful)' do
     before do
-      put :update, format: 'json', id: application.to_param, doorkeeper_application: application.attributes
+      put :update, params: {format: 'json', id: application.to_param, bsm_oa_application: application.attributes}
     end
 
-    it { expect(response.body).to have_json_size(6) }
-    it { is_expected.to respond_with(:success) }
+    it { is_expected.to respond_with(:no_content) }
   end
 
   describe 'PUT update.json (unsuccessful)' do
     before do
-      put :update, format: 'json', id: application.to_param, doorkeeper_application: application.attributes.merge(name: nil)
+      put :update, params: {format: 'json', id: application.to_param, bsm_oa_application: build(:application, name: nil).attributes}
     end
 
-    it { expect(response.body).to have_json_path('errors') }
     it { is_expected.to respond_with(:unprocessable_entity) }
   end
 
   describe 'PUT update.html' do
     before do
-      put :update, id: application.to_param, doorkeeper_application: application.attributes
+      put :update, params: {id: application.to_param, bsm_oa_application: application.attributes}
     end
 
     it { is_expected.to respond_with(:redirect) }
-    it { is_expected.to redirect_to("http://test.host/oauth/applications/#{application.to_param}") }
+    it { is_expected.to redirect_to("http://test.host/applications/#{application.to_param}") }
   end
 
   describe 'DELETE destroy.json' do
     before do
-      delete :destroy, format: 'json', id: application.to_param
+      delete :destroy, params: {format: 'json', id: application.to_param}
     end
 
     it { is_expected.to respond_with(:no_content) }
@@ -105,10 +99,10 @@ describe BsmOa::ApplicationsController, type: :controller do
 
   describe 'DELETE destroy.html' do
     before do
-      delete :destroy, id: application.to_param
+      delete :destroy, params: {id: application.to_param}
     end
 
     it { is_expected.to respond_with(:redirect) }
-    it { is_expected.to redirect_to("http://test.host/oauth/applications") }
+    it { is_expected.to redirect_to("http://test.host/applications") }
   end
 end

data/spec/controllers/bsm_oa/authorizations_controller_spec.rb

@@ -19,18 +19,16 @@ describe BsmOa::AuthorizationsController, type: :controller do
   describe 'GET index.json' do
     before do
       resource
-      get :index, bsm_oa_role_id: role.to_param, format: 'json'
+      get :index, params: {bsm_oa_role_id: role.to_param, format: 'json'}
     end
 
     it { is_expected.to respond_with(:success) }
-    it { expect(response.body).to have_json_size(1) }
-    it { expect(response.body).to have_json_size(3).at_path('0') }
   end
 
   describe 'GET index.html' do
     before do
       resource
-      get :index, bsm_oa_role_id: role.to_param
+      get :index, params: {bsm_oa_role_id: role.to_param}
     end
 
     it { is_expected.to render_template(:index) }
@@ -39,7 +37,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'GET new.html' do
     before do
-      get :new, bsm_oa_role_id: role.to_param
+      get :new, params: {bsm_oa_role_id: role.to_param}
     end
     it { is_expected.to render_template(:new) }
     it { is_expected.to respond_with(:success) }
@@ -47,22 +45,21 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'GET show.html' do
     before do
-      get :show, id: resource.to_param
+      get :show, params: {id: resource.to_param}
     end
     it { is_expected.to redirect_to("/roles/#{resource.role.to_param}") }
   end
 
   describe 'GET show.json' do
     before do
-      get :show, id: resource.to_param, format: "json"
+      get :show, params: {id: resource.to_param, format: "json"}
     end
     it { is_expected.to respond_with(:success) }
-    it { expect(response.body).to have_json_size(4) }
   end
 
   describe 'GET edit.html' do
     before do
-      get :edit, id: resource.to_param
+      get :edit, params: {id: resource.to_param}
     end
     it { is_expected.to render_template(:edit) }
     it { is_expected.to respond_with(:success) }
@@ -71,17 +68,16 @@ describe BsmOa::AuthorizationsController, type: :controller do
   describe 'POST create.json (successful)' do
     before do
       role = create(:role)
-      post :create, format: 'json', bsm_oa_role_id: role.to_param, authorization: resource.attributes.merge( permissions_string: 'admin')
+      post :create, params: {format: 'json', bsm_oa_role_id: role.to_param, bsm_oa_authorization: resource.attributes.merge( permissions: 'admin')}
     end
 
     it { is_expected.to respond_with(:created) }
-    it { expect(response.body).to have_json_size(4) }
   end
 
   describe 'POST create.html (successful)' do
     before do
       role = create(:role)
-      post :create, authorization: resource.attributes.merge( permissions_string: 'admin'), bsm_oa_role_id: role.to_param
+      post :create, params: {bsm_oa_authorization: resource.attributes.merge( permissions: 'admin'), bsm_oa_role_id: role.to_param}
     end
 
     it { is_expected.to respond_with(:redirect) }
@@ -91,7 +87,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
   describe 'POST create.html (unsuccessful)' do
     before do
       role = create(:role)
-      post :create, bsm_oa_role_id: role.to_param, authorization: { application_id: '' }
+      post :create, params: {bsm_oa_role_id: role.to_param, bsm_oa_authorization: { application_id: '' }}
      end
 
     it { is_expected.to respond_with(:success) }
@@ -100,7 +96,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT update.html (successful)' do
     before do
-      put :update, id: resource.to_param, authorization: { permissions_string: 'admin' }
+      put :update, params: {id: resource.to_param, bsm_oa_authorization: { permissions: 'admin' }}
     end
 
     it { is_expected.to respond_with(:redirect) }
@@ -109,7 +105,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT update.html (unsuccessful)' do
     before do
-      put :update, id: resource.to_param, authorization: { application_id: '0' }
+      put :update, params: {id: resource.to_param, bsm_oa_authorization: { application_id: '0' }}
     end
 
     it { is_expected.to respond_with(:success) }
@@ -118,7 +114,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT update.json (successful)' do
     before do
-      put :update, format: 'json', id: resource.to_param, authorization: { permissions_string: 'admin' }
+      put :update, params: {format: 'json', id: resource.to_param, bsm_oa_authorization: { permissions: 'admin' }}
     end
 
     it { is_expected.to respond_with(:no_content) }
@@ -126,7 +122,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT update.json (unsuccessful)' do
     before do
-      put :update, format: 'json', id: resource.to_param, authorization: { application_id: '0' }
+      put :update, params: {format: 'json', id: resource.to_param, bsm_oa_authorization: { application_id: '0' }}
     end
 
     it { is_expected.to respond_with(:unprocessable_entity) }
@@ -134,7 +130,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT toggle' do
     before do
-      put :toggle, id: resource.to_param, permission: "admin"
+      put :toggle, params: {id: resource.to_param, permission: "admin"}
     end
 
     it { is_expected.to respond_with(:redirect) }
@@ -143,7 +139,7 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT toggle.js' do
     before do
-      put :toggle, id: resource.to_param, permission: "admin", format: "js"
+      put :toggle, params: {id: resource.to_param, permission: "admin", format: "js"}
     end
 
     it { is_expected.to respond_with(:success) }
@@ -152,11 +148,10 @@ describe BsmOa::AuthorizationsController, type: :controller do
 
   describe 'PUT toggle.json' do
     before do
-      put :toggle, id: resource.to_param, permission: "admin", format: "json"
+      put :toggle, params: {id: resource.to_param, permission: "admin", format: "json"}
     end
 
-    it { is_expected.to respond_with(:success) }
-    it { expect(response.body).to have_json_size(4) }
+    it { is_expected.to respond_with(:no_content) }
   end
 
 end

data/spec/controllers/bsm_oa/roles_controller_spec.rb

@@ -17,36 +17,34 @@ describe BsmOa::RolesController, type: :controller do
   describe 'GET index.json' do
     before do
       resource
-      get :index, format: 'json'
+      get :index, params: {format: 'json'}
     end
 
     it { is_expected.to respond_with(:success) }
-    it { expect(response.body).to have_json_size(1) }
   end
 
   describe 'GET show.json' do
     before do
-      get :show, id: resource.to_param, format: 'json'
+      get :show, params: {id: resource.to_param, format: 'json'}
     end
 
     it { is_expected.to respond_with(:success) }
-    it { expect(response.body).to have_json_size(2) }
   end
 
   describe 'POST create.json (successful)' do
     before do
-      post :create, format: 'json', role: resource.attributes.merge(name: "admin")
+      post :create, params: {format: 'json', bsm_oa_role: build(:role).attributes }
     end
 
-    it { is_expected.to respond_with(:success) }
+    it { is_expected.to respond_with(:created) }
   end
 
   describe 'PUT update.json (successful)' do
     before do
-      post :update, format: 'json', id: resource.to_param, role: { name: "newname"}
+      put :update, params: {format: 'json', id: resource.to_param, bsm_oa_role: { name: "newname"}}
     end
 
-    it { is_expected.to respond_with(:success) }
+    it { is_expected.to respond_with(:no_content) }
   end
 
   describe 'GET index.html' do
@@ -60,7 +58,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'GET show.html' do
     before do
-      get :show, id: resource.to_param
+      get :show, params: {id: resource.to_param}
     end
 
     it { is_expected.to render_template(:show) }
@@ -69,7 +67,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'GET edit.html' do
     before do
-      get :edit, id: resource.to_param
+      get :edit, params: {id: resource.to_param}
     end
     it { is_expected.to render_template(:edit) }
     it { is_expected.to respond_with(:success) }
@@ -85,7 +83,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'POST create.html (successful)' do
     before do
-      post :create, role: resource.attributes.merge(name: "newname")
+      post :create, params: {bsm_oa_role: build(:role).attributes}
     end
     it { is_expected.to respond_with(:redirect) }
     it { is_expected.to redirect_to("http://test.host/roles/#{BsmOa::Role.last.to_param}") }
@@ -93,7 +91,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'POST create.html (unsuccessful)' do
     before do
-      post :create, role: resource.attributes
+      post :create, params: {bsm_oa_role: resource.attributes}
     end
 
     it { is_expected.to respond_with(:success) }
@@ -102,7 +100,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'PUT update.html (successful)' do
     before do
-      post :update, id: resource.to_param, role: { name: "newname"}
+      post :update, params: {id: resource.to_param, bsm_oa_role: { name: "newname"}}
     end
 
     it { is_expected.to respond_with(:redirect) }
@@ -111,7 +109,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'PUT update.html (unsuccessful)' do
     before do
-      put :update, id: resource.to_param, role: { name: "" }
+      put :update, params: {id: resource.to_param, bsm_oa_role: { name: "" }}
     end
 
     it { is_expected.to respond_with(:success) }
@@ -120,7 +118,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'DELETE destroy.json' do
     before do
-      delete :destroy, format: 'json', id: resource.to_param
+      delete :destroy, params: {format: 'json', id: resource.to_param}
     end
 
     it { is_expected.to respond_with(:no_content) }
@@ -128,7 +126,7 @@ describe BsmOa::RolesController, type: :controller do
 
   describe 'DELETE destroy.html' do
     before do
-      delete :destroy, id: resource.to_param
+      delete :destroy, params: {id: resource.to_param}
     end
 
     it { is_expected.to respond_with(:redirect) }

data/spec/factories.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
 
-  factory :application, class: Doorkeeper::Application do
+  factory :application, class: BsmOa::Application do
     sequence(:name) { |n| "Application #{n}" }
     redirect_uri 'https://app.com/callback'
     permissions ['admin', 'finance', 'operations']