mno-enterprise-api 3.1.4 → 3.2.0

data/spec/controllers/mno_enterprise/jpi/v1/admin/tenant_invoices_controller_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 module MnoEnterprise
   describe Jpi::V1::Admin::TenantInvoicesController, type: :controller do
+    include MnoEnterprise::TestingSupport::SharedExamples::JpiV1Admin
     render_views
     routes { MnoEnterprise::Engine.routes }
     before { request.env["HTTP_ACCEPT"] = 'application/json' }
@@ -66,6 +67,8 @@ module MnoEnterprise
     describe '#index' do
       subject { get :index }
 
+      it_behaves_like 'a jpi v1 admin action'
+
       context 'success' do
         before { subject }
 
@@ -79,6 +82,8 @@ module MnoEnterprise
     describe 'GET #show' do
       subject { get :show, id: tenant_invoice.id }
 
+      it_behaves_like 'a jpi v1 admin action'
+
       context 'success' do
         before { subject }
 

data/spec/controllers/mno_enterprise/jpi/v1/admin/users_controller_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 module MnoEnterprise
   describe Jpi::V1::Admin::UsersController, type: :controller do
+    include MnoEnterprise::TestingSupport::SharedExamples::JpiV1Admin
     render_views
     routes { MnoEnterprise::Engine.routes }
     before { request.env["HTTP_ACCEPT"] = 'application/json' }
@@ -28,7 +29,8 @@ module MnoEnterprise
           'admin_role' => user.admin_role,
           'created_at' => user.created_at,
           'last_sign_in_at' => user.last_sign_in_at,
-          'confirmed_at' => user.confirmed_at
+          'confirmed_at' => user.confirmed_at,
+          'sign_in_count' => user.sign_in_count
       }
     end
 
@@ -67,6 +69,8 @@ module MnoEnterprise
     describe '#index' do
       subject { get :index }
 
+      it_behaves_like "a jpi v1 admin action"
+
       context 'success' do
         before { subject }
 
@@ -80,6 +84,8 @@ module MnoEnterprise
     describe 'GET #show' do
       subject { get :show, id: user.id }
 
+      it_behaves_like "a jpi v1 admin action"
+
       context 'success' do
         before { subject }
 
@@ -100,22 +106,27 @@ module MnoEnterprise
 
         user.admin_role = nil
         api_stub_for(put: "/users/#{user.id}", response: -> { user.admin_role = 'staff'; from_api(user) })
-        subject
       end
 
-      context 'when admin' do
-        it { expect(response).to be_success }
+      it_behaves_like "a jpi v1 admin action"
 
-        # Test that the user is updated by testing the api endpoint was called
-        it { expect(user.admin_role).to eq('staff') }
-      end
+      context 'success' do
+        before { subject }
 
-      context 'when staff' do
-        let(:current_user) { build(:user, :staff) }
+        context 'when admin' do
+          it { expect(response).to be_success }
+
+          # Test that the user is updated by testing the api endpoint was called
+          it { expect(user.admin_role).to eq('staff') }
+        end
 
-        it { expect(response).to have_http_status(:unauthorized) }
+        context 'when staff' do
+          let(:current_user) { build(:user, :staff) }
 
-        it { expect(user.admin_role).to be_nil }
+          it { expect(response).to have_http_status(:unauthorized) }
+
+          it { expect(user.admin_role).to be_nil }
+        end
       end
     end
 
@@ -126,20 +137,23 @@ module MnoEnterprise
       before do
         api_stub_for(get: "/users/#{user_to_delete.id}", respond_with: user_to_delete)
         api_stub_for(delete: "/users/#{user_to_delete.id}", response: ->{ user_to_delete.name = 'deleted'; from_api(user_to_delete) })
-        subject
       end
 
-      it { expect(response).to be_success }
+      it_behaves_like "a jpi v1 admin action"
 
-      # Test that the user is deleted by testing the api endpoint was called
-      it { expect(user_to_delete.name).to eq('deleted') }
+      context 'success' do
+        before { subject }
+
+        # Test that the user is deleted by testing the api endpoint was called
+        it { expect(user_to_delete.name).to eq('deleted') }
+      end
     end
 
     describe 'POST #signup_email' do
       let(:email) { 'test@test.com' }
       subject { post :signup_email, user: {email: email}}
 
-      it { expect(response).to be_success }
+      it_behaves_like "a jpi v1 admin action"
 
       it 'sends the signup instructions' do
         message_delivery = instance_double(ActionMailer::MessageDelivery)

data/spec/controllers/mno_enterprise/jpi/v1/app_answers_controller_spec.rb

@@ -0,0 +1,74 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe Jpi::V1::AppAnswersController, type: :controller do
+    include MnoEnterprise::TestingSupport::JpiV1TestHelper
+    render_views
+    routes { MnoEnterprise::Engine.routes }
+    before { request.env["HTTP_ACCEPT"] = 'application/json' }
+
+
+    #===============================================
+    # Assignments
+    #===============================================
+    let(:user) { build(:user) }
+    before { api_stub_for(get: "/users/#{user.id}", response: from_api(user)) }
+    before { sign_in user }
+
+    let(:app) { build(:app) }
+    let(:answer_1) { build(:app_answer, question_id: 'qid') }
+    let(:answer_2) { build(:app_answer, question_id: 'qid') }
+    let(:expected_hash_for_answer_1) do
+      attrs = %w(id description status user_id user_name organization_id organization_name app_id question_id app_name user_admin_role edited edited_by_name edited_by_admin_role edited_by_id)
+      answer_1.attributes.slice(*attrs).merge({'created_at' => answer_1.created_at.as_json, 'updated_at' => answer_1.updated_at.as_json})
+    end
+    let(:expected_hash_for_answer_2) do
+      attrs = %w(id description status user_id user_name organization_id organization_name app_id question_id app_name user_admin_role edited edited_by_name edited_by_admin_role edited_by_id)
+      answer_2.attributes.slice(*attrs).merge({'created_at' => answer_2.created_at.as_json, 'updated_at' => answer_2.updated_at.as_json})
+    end
+    let(:expected_hash_for_answers) do
+      {
+        'app_answers' => [expected_hash_for_answer_1, expected_hash_for_answer_2],
+      }
+    end
+
+    before do
+      api_stub_for(get: "/apps/#{app.id}", response: from_api(app))
+    end
+
+    describe 'GET #index' do
+
+      before do
+        api_stub_for(get: "/app_answers?filter[question_id]=qid&filter[status]=approved", response: from_api([expected_hash_for_answer_1, expected_hash_for_answer_2]))
+      end
+
+      subject { get :index, id: app.id, question_id: 'qid' }
+
+      it_behaves_like "jpi v1 protected action"
+
+      it_behaves_like "a paginated action"
+
+      it 'renders the list of reviews' do
+        subject
+        expect(JSON.parse(response.body)).to eq(expected_hash_for_answers)
+      end
+    end
+
+    describe 'POST #create', focus: true do
+      let(:params) { {organization_id: 1, description: 'A Review', foo: 'bar', question_id: 'qid'} }
+
+      before do
+        api_stub_for(post: "/app_answers", response: from_api(answer_1))
+        api_stub_for(get: "/app_answers/#{answer_1.id}", response: from_api(answer_1))
+      end
+
+      subject { post :create, id: app.id, app_answer: params }
+
+      it_behaves_like "jpi v1 protected action"
+
+      it 'renders the new review' do
+        expect(JSON.parse(subject.body)).to include('app_answer' => expected_hash_for_answer_1)
+      end
+    end
+  end
+end

data/spec/controllers/mno_enterprise/jpi/v1/app_comments_controller_spec.rb

@@ -0,0 +1,74 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe Jpi::V1::AppCommentsController, type: :controller do
+    include MnoEnterprise::TestingSupport::JpiV1TestHelper
+    render_views
+    routes { MnoEnterprise::Engine.routes }
+    before { request.env["HTTP_ACCEPT"] = 'application/json' }
+
+
+    #===============================================
+    # Assignments
+    #===============================================
+    let(:user) { build(:user) }
+    before { api_stub_for(get: "/users/#{user.id}", response: from_api(user)) }
+    before { sign_in user }
+
+    let(:app) { build(:app) }
+    let(:comment_1) { build(:app_comment, feedback_id: 'fid') }
+    let(:comment_2) { build(:app_comment, feedback_id: 'fid') }
+    let(:expected_hash_for_comment_1) do
+      attrs = %w(id description status user_id user_name organization_id organization_name app_id feedback_id app_name user_admin_role edited edited_by_name edited_by_admin_role edited_by_id)
+      comment_1.attributes.slice(*attrs).merge({'created_at' => comment_1.created_at.as_json, 'updated_at' => comment_1.updated_at.as_json})
+    end
+    let(:expected_hash_for_comment_2) do
+      attrs = %w(id description status user_id user_name organization_id organization_name app_id feedback_id app_name user_admin_role edited edited_by_name edited_by_admin_role edited_by_id)
+      comment_2.attributes.slice(*attrs).merge({'created_at' => comment_2.created_at.as_json, 'updated_at' => comment_2.updated_at.as_json})
+    end
+    let(:expected_hash_for_comments) do
+      {
+        'app_comments' => [expected_hash_for_comment_1, expected_hash_for_comment_2],
+      }
+    end
+
+    before do
+      api_stub_for(get: "/apps/#{app.id}", response: from_api(app))
+    end
+
+    describe 'GET #index' do
+
+      before do
+        api_stub_for(get: "/app_comments?filter[feedback_id]=fid&filter[status]=approved", response: from_api([expected_hash_for_comment_1, expected_hash_for_comment_2]))
+      end
+
+      subject { get :index, id: app.id, feedback_id: 'fid' }
+
+      it_behaves_like "jpi v1 protected action"
+
+      it_behaves_like "a paginated action"
+
+      it 'renders the list of reviews' do
+        subject
+        expect(JSON.parse(response.body)).to eq(expected_hash_for_comments)
+      end
+    end
+
+    describe 'POST #create', focus: true do
+      let(:params) { {organization_id: 1, description: 'A Review', foo: 'bar', feedback_id: 'fid'} }
+
+      before do
+        api_stub_for(post: "/app_comments", response: from_api(comment_1))
+        api_stub_for(get: "/app_comments/#{comment_1.id}", response: from_api(comment_1))
+      end
+
+      subject { post :create, id: app.id, app_comment: params }
+
+      it_behaves_like "jpi v1 protected action"
+
+      it 'renders the new review' do
+        expect(JSON.parse(subject.body)).to include('app_comment' => expected_hash_for_comment_1)
+      end
+    end
+  end
+end

data/spec/controllers/mno_enterprise/jpi/v1/app_feedbacks_controller_spec.rb

@@ -0,0 +1,84 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe Jpi::V1::AppFeedbacksController, type: :controller do
+    include MnoEnterprise::TestingSupport::JpiV1TestHelper
+    render_views
+    routes { MnoEnterprise::Engine.routes }
+    before { request.env["HTTP_ACCEPT"] = 'application/json' }
+
+
+    #===============================================
+    # Assignments
+    #===============================================
+    let(:user) { build(:user) }
+    before { api_stub_for(get: "/users/#{user.id}", response: from_api(user)) }
+    before { sign_in user }
+
+    let(:app) { build(:app) }
+    let(:feedback_comment_1) { build(:app_comment) }
+    let(:feedback_comment_2) { build(:app_comment) }
+    let(:app_feedback) { build(:app_feedback, comments: [feedback_comment_1, feedback_comment_2]) }
+    let(:expected_hash_for_comment_1) do
+      attrs = %w(id description status user_id user_name organization_id organization_name app_id feedback_id app_name user_admin_role edited edited_by_name edited_by_admin_role edited_by_id)
+      feedback_comment_1.attributes.slice(*attrs).merge({'created_at' => feedback_comment_1.created_at.as_json, 'updated_at' => feedback_comment_1.updated_at.as_json})
+    end
+    let(:expected_hash_for_comment_2) do
+      attrs = %w(id description status user_id user_name organization_id organization_name app_id feedback_id app_name user_admin_role edited edited_by_name edited_by_admin_role edited_by_id)
+      feedback_comment_2.attributes.slice(*attrs).merge({'created_at' => feedback_comment_2.created_at.as_json, 'updated_at' => feedback_comment_2.updated_at.as_json})
+    end
+    let(:expected_array_for_comments) { [expected_hash_for_comment_1, expected_hash_for_comment_2] }
+    let(:expected_hash_for_feedback) do
+      attrs = %w(id rating description status user_id user_name organization_id organization_name app_id app_name user_admin_role comments edited edited_by_name edited_by_admin_role edited_by_id)
+      app_feedback.attributes.slice(*attrs).merge({'created_at' => app_feedback.created_at.as_json, 'updated_at' => app_feedback.updated_at.as_json, 'comments' => expected_array_for_comments})
+    end
+    let(:expected_hash_for_feedbacks) do
+      {
+        'app_feedbacks' => [expected_hash_for_feedback],
+      }
+    end
+
+    before do
+      api_stub_for(get: "/apps/#{app.id}", response: from_api(app))
+    end
+
+    describe 'GET #index' do
+
+      before do
+        api_stub_for(get: "/app_feedbacks?filter[reviewable_id]=#{app.id}", response: from_api([app_feedback]))
+      end
+
+      subject { get :index, id: app.id }
+
+      it_behaves_like "jpi v1 protected action"
+
+      it_behaves_like "a paginated action"
+
+      it 'renders the list of reviews' do
+        subject
+        expect(JSON.parse(response.body)).to eq(expected_hash_for_feedbacks)
+      end
+    end
+
+    describe 'POST #create', focus: true do
+      let(:params) { {organization_id: 1, description: 'A Review', rating: 5, foo: 'bar'} }
+
+      before do
+        api_stub_for(post: "/app_feedbacks", response: from_api(app_feedback))
+        api_stub_for(get: "/app_feedbacks/#{app_feedback.id}", response: from_api(app_feedback))
+      end
+
+      subject { post :create, id: app.id, app_feedback: params }
+
+      it_behaves_like "jpi v1 protected action"
+
+      it 'renders the new review' do
+        expect(JSON.parse(subject.body)).to include('app_feedback' => expected_hash_for_feedback)
+      end
+
+      it 'renders the new average rating' do
+        expect(JSON.parse(subject.body)).to include('average_rating' => app.average_rating)
+      end
+    end
+  end
+end

data/spec/controllers/mno_enterprise/jpi/v1/app_instances_controller_spec.rb

@@ -15,14 +15,23 @@ module MnoEnterprise
     # Stub user and user call
     let(:user) { build(:user) }
     before { api_stub_for(get: "/users/#{user.id}", response: from_api(user)) }
-
-    # Stub organization/app_instance + associations
+    # Stub organization + associations
     let(:organization) { build(:organization) }
-    let(:app_instance) { build(:app_instance, status: "running") }
     before { allow_any_instance_of(MnoEnterprise::User).to receive(:organizations).and_return([organization]) }
-    before { allow(organization).to receive(:app_instances).and_return([app_instance]) }
 
     describe 'GET #index' do
+      let(:app_instance) { build(:app_instance, status: "running") }
+      let(:app_instance) { build(:app_instance, under_free_trial: false) }
+      let(:app_instances) { instance_double('Her::Model::Relation') }
+
+      before do
+        allow(organization).to receive(:app_instances).and_return(app_instances)
+        # Only active instances
+        allow(app_instances).to receive(:active).and_return(app_instances)
+        # Updated since last tick
+        allow(app_instances).to receive(:where).and_return([app_instance])
+      end
+
       before { sign_in user }
       let(:timestamp) { nil }
       subject { get :index, organization_id: organization.id, timestamp: timestamp }
@@ -30,35 +39,40 @@ module MnoEnterprise
       it_behaves_like "jpi v1 protected action"
 
       describe 'all' do
-        before { subject }
-        it { expect(assigns(:app_instances)).to eq([app_instance]) }
+        it { subject; expect(assigns(:app_instances)).to eq([app_instance]) }
+
+        it 'filter only active instances' do
+          expect(app_instances).to receive(:active)
+          subject
+        end
       end
 
-      describe 'with inactive app_instances' do
-        let(:app_instance) { build(:app_instance, status: "terminated", terminated_at: 10.minutes.ago) }
-        before { subject }
-        it { expect(assigns(:app_instances)).to be_empty }
+      context 'with timestamp' do
+        let(:timestamp) { Time.current.to_i }
+
+        it 'filter updates since last request' do
+          expect(app_instances).to receive(:where).with("updated_at.gt" => Time.at(timestamp))
+          subject
+        end
       end
 
-      describe 'with no access to the app_instance' do
+      context 'without access to the app_instance' do
         before { allow(ability).to receive(:can?).with(any_args).and_return(false) }
         before { subject }
         it { expect(assigns(:app_instances)).to be_empty }
       end
+    end
 
-      describe 'with timestamp' do
-        describe 'before instance updated_at' do
-          let(:timestamp) { (app_instance.updated_at - 2.minutes).to_i }
-          before { subject }
-          it { expect(assigns(:app_instances)).to eq([app_instance]) }
-        end
+    describe 'POST #create' do
+      let(:app) { build(:app, nid: 'my-app' ) }
+      let(:app_instance) { build(:app_instance, app: app, owner: organization ) }
+      subject { post :create, organization_id: organization.id, nid: 'my-app' }
 
-        describe 'after instance updated_at' do
-          let(:timestamp) { (app_instance.updated_at + 2.minutes).to_i }
-          before { subject }
-          it { expect(assigns(:app_instances)).to be_empty }
-        end
+      before do
+        api_stub_for(post: "/organizations/#{organization.id}/app_instances", response: from_api(app_instance))
+        api_stub_for(get: "/organizations/#{organization.id}/app_instances", response: from_api([app_instance]))
       end
+      it_behaves_like "jpi v1 protected action"
     end
 
     describe 'DELETE #destroy' do