mno-enterprise-api 3.3.1 → 3.3.2

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

@@ -158,7 +158,6 @@ module MnoEnterprise
           end
 
           context 'on a subsequent request'  do
-
             before do
               request.env['HTTP_IF_MODIFIED_SINCE'] = last_modified.rfc2822
             end
@@ -176,6 +175,37 @@ module MnoEnterprise
           end
         end
       end
+
+      context 'without apps' do
+        before do
+          MnoEnterprise.marketplace_listing = nil
+          api_stub_for(get: '/apps', response: from_api([]))
+        end
+
+        it { is_expected.to have_http_status(:ok) }
+
+        it 'does not set last modified header' do
+          subject
+          header = response.headers['Last-Modified']
+
+          expect(header).not_to be_present
+        end
+
+        context 'with a if-modified-since header' do
+          before do
+            request.env['HTTP_IF_MODIFIED_SINCE'] = Time.current.rfc2822
+          end
+
+          it { is_expected.to have_http_status(:ok) }
+
+          it 'does not set last modified header' do
+            subject
+            header = response.headers['Last-Modified']
+
+            expect(header).not_to be_present
+          end
+        end
+      end
     end
 
     describe 'GET #show' do

data/spec/controllers/mno_enterprise/pages_controller_spec.rb

@@ -63,12 +63,23 @@ module MnoEnterprise
     end
 
     describe 'GET #terms' do
-      before { api_stub_for(get: "/apps", response: from_api([build(:app)])) }
+      let!(:app1) { build(:app, name: 'b') }
+      let!(:app2) { build(:app, name:'a') }
+      let!(:app3) { build(:app, name: 'c') }
+
+      before do
+        Rails.cache.clear
+        api_stub_for(get: '/apps', response: from_api([app1, app2, app3]))
+      end
 
       subject { get :terms }
       before { subject }
+
       it { expect(response).to be_success }
+      
+      it 'returns the apps in the correct alphabetical order' do
+        expect(assigns(:apps)).to eq([app2, app1, app3])
+      end
     end
-
   end
 end

data/spec/routing/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller_routing_spec.rb

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Jpi::V1::Admin::Impac::DashboardTemplatesController, type: :routing do
+    routes { MnoEnterprise::Engine.routes }
+
+    it 'routes to #index' do
+      expect(get('/jpi/v1/admin/impac/dashboard_templates')).to route_to('mno_enterprise/jpi/v1/admin/impac/dashboard_templates#index', format: 'json')
+    end
+
+    it 'routes to #create' do
+      expect(post('/jpi/v1/admin/impac/dashboard_templates')).to route_to('mno_enterprise/jpi/v1/admin/impac/dashboard_templates#create', format: 'json')
+    end
+
+    it 'routes to #show' do
+      expect(get('/jpi/v1/admin/impac/dashboard_templates/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/dashboard_templates#show', id: '2', format: 'json')
+    end
+
+    it 'routes to #update' do
+      expect(put('/jpi/v1/admin/impac/dashboard_templates/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/dashboard_templates#update', id: '2', format: 'json')
+      expect(patch('/jpi/v1/admin/impac/dashboard_templates/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/dashboard_templates#update', id: '2', format: 'json')
+    end
+
+    it 'routes to #destroy' do
+      expect(delete('/jpi/v1/admin/impac/dashboard_templates/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/dashboard_templates#destroy', id: '2', format: 'json')
+    end
+  end
+end

data/spec/routing/mno_enterprise/jpi/v1/admin/impac/kpis_controller_routing_spec.rb

@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Jpi::V1::Admin::Impac::KpisController, type: :routing do
+    routes { MnoEnterprise::Engine.routes }
+
+    it 'routes to #create' do
+      expect(post('/jpi/v1/admin/impac/dashboard_templates/1/kpis')).to route_to('mno_enterprise/jpi/v1/admin/impac/kpis#create', dashboard_template_id: '1', format: 'json')
+    end
+
+    it 'routes to #update' do
+      expect(put('/jpi/v1/admin/impac/kpis/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/kpis#update', id: '2', format: 'json')
+      expect(patch('/jpi/v1/admin/impac/kpis/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/kpis#update', id: '2', format: 'json')
+    end
+
+    it 'routes to #destroy' do
+      expect(delete('/jpi/v1/admin/impac/kpis/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/kpis#destroy', id: '2', format: 'json')
+    end
+  end
+end

data/spec/routing/mno_enterprise/jpi/v1/admin/impac/widgets_controller_routing_spec.rb

@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Jpi::V1::Admin::Impac::WidgetsController, type: :routing do
+    routes { MnoEnterprise::Engine.routes }
+
+    it 'routes to #create' do
+      expect(post('/jpi/v1/admin/impac/dashboard_templates/1/widgets')).to route_to('mno_enterprise/jpi/v1/admin/impac/widgets#create', dashboard_template_id: '1', format: 'json')
+    end
+
+    it 'routes to #update' do
+      expect(put('/jpi/v1/admin/impac/widgets/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/widgets#update', id: '2', format: 'json')
+      expect(patch('/jpi/v1/admin/impac/widgets/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/widgets#update', id: '2', format: 'json')
+    end
+
+    it 'routes to #destroy' do
+      expect(delete('/jpi/v1/admin/impac/widgets/2')).to route_to('mno_enterprise/jpi/v1/admin/impac/widgets#destroy', id: '2', format: 'json')
+    end
+  end
+end

data/spec/routing/mno_enterprise/jpi/v1/impac/dashboard_templates_controller_routing_spec.rb

@@ -0,0 +1,11 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Jpi::V1::Impac::DashboardTemplatesController, type: :routing do
+    routes { MnoEnterprise::Engine.routes }
+
+    it 'routes to #index' do
+      expect(get('/jpi/v1/impac/dashboard_templates')).to route_to('mno_enterprise/jpi/v1/impac/dashboard_templates#index')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,9 @@ files:
 - app/controllers/mno_enterprise/jpi/v1/admin/audit_events_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/base_resource_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/cloud_apps_controller.rb
+- app/controllers/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller.rb
+- app/controllers/mno_enterprise/jpi/v1/admin/impac/kpis_controller.rb
+- app/controllers/mno_enterprise/jpi/v1/admin/impac/widgets_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/invites_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/invoices_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/organizations_controller.rb
@@ -242,6 +245,7 @@ files:
 - app/controllers/mno_enterprise/jpi/v1/current_users_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/deletion_requests_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/impac/alerts_controller.rb
+- app/controllers/mno_enterprise/jpi/v1/impac/dashboard_templates_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/impac/dashboards_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/impac/kpis_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/impac/widgets_controller.rb
@@ -295,6 +299,13 @@ files:
 - app/views/mno_enterprise/jpi/v1/admin/cloud_apps/_cloud_app.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/cloud_apps/index.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/cloud_apps/show.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/dashboard_templates/_template.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/dashboard_templates/index.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/dashboard_templates/show.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/kpis/_kpi.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/kpis/show.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/widgets/_widget.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/impac/widgets/show.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/invoices/_invoice.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/invoices/index.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/invoices/show.json.jbuilder
@@ -340,6 +351,7 @@ files:
 - app/views/mno_enterprise/jpi/v1/impac/alerts/_alert.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/impac/alerts/index.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/impac/alerts/show.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/impac/dashboard_templates/index.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/impac/dashboards/_dashboard.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/impac/dashboards/index.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/impac/dashboards/show.json.jbuilder
@@ -397,6 +409,7 @@ files:
 - lib/mno_enterprise/concerns/controllers/jpi/v1/current_users_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/deletion_requests_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/impac/alerts_controller.rb
+- lib/mno_enterprise/concerns/controllers/jpi/v1/impac/dashboard_templates_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/impac/dashboards_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/impac/kpis_controller.rb
 - lib/mno_enterprise/concerns/controllers/jpi/v1/impac/widgets_controller.rb
@@ -425,6 +438,9 @@ files:
 - spec/controllers/mno_enterprise/jpi/v1/admin/app_reviews_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/audit_events_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/cloud_apps_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/admin/impac/kpis_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/admin/impac/widgets_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/invites_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/invoices_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/organizations_controller_spec.rb
@@ -441,6 +457,8 @@ files:
 - spec/controllers/mno_enterprise/jpi/v1/current_users_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/deletion_requests_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/impac/alerts_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/impac/dashboard_templates_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/impac/dashboards_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/impac/kpis_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/impac/widgets_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/marketplace_controller_spec.rb
@@ -471,6 +489,9 @@ files:
 - spec/routing/mno_enterprise/jpi/v1/admin/app_reviews_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/audit_events_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/cloud_apps_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/admin/impac/kpis_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/admin/impac/widgets_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/invites_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/invoices_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/organizations_controller_routing_spec.rb
@@ -484,6 +505,7 @@ files:
 - spec/routing/mno_enterprise/jpi/v1/current_users_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/deletion_requests_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/alerts_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/impac/dashboard_templates_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/dashboards_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/kpis_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/widgets_controller_routing_spec.rb
@@ -535,6 +557,9 @@ test_files:
 - spec/routing/mno_enterprise/jpi/v1/admin/app_instances_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/audit_events_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/app_questions_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/admin/impac/widgets_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/admin/impac/kpis_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/theme_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/invoices_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/invites_controller_routing_spec.rb
@@ -548,6 +573,7 @@ test_files:
 - spec/routing/mno_enterprise/jpi/v1/app_instances_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/audit_events_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/widgets_controller_routing_spec.rb
+- spec/routing/mno_enterprise/jpi/v1/impac/dashboard_templates_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/kpis_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/alerts_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/impac/dashboards_controller_routing_spec.rb
@@ -581,6 +607,9 @@ test_files:
 - spec/controllers/mno_enterprise/jpi/v1/admin/invites_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/app_feedbacks_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/app_instances_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/admin/impac/kpis_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/admin/impac/widgets_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/app_answers_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/invoices_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/tenant_invoices_controller_spec.rb
@@ -596,6 +625,8 @@ test_files:
 - spec/controllers/mno_enterprise/jpi/v1/app_instances_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/impac/kpis_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/impac/widgets_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/impac/dashboards_controller_spec.rb
+- spec/controllers/mno_enterprise/jpi/v1/impac/dashboard_templates_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/impac/alerts_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/app_answers_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/team_controller_spec.rb