mno-enterprise-api 3.0.7 → 3.1.0

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

@@ -6,6 +6,8 @@ module MnoEnterprise
     routes { MnoEnterprise::Engine.routes }
     before { request.env["HTTP_ACCEPT"] = 'application/json' }
 
+    include MnoEnterprise::ApplicationHelper # For #avatar_url
+
     def json_for(res)
       json_hash_for(res).to_json
     end
@@ -28,7 +30,8 @@ module MnoEnterprise
           'country_code' => res.geo_country_code || 'US',
           'website' => res.website,
           'sso_session' => res.sso_session,
-          'admin_role' => res.admin_role
+          'admin_role' => res.admin_role,
+          'avatar_url' => avatar_url(res)
       }
 
       if res.id

data/spec/controllers/mno_enterprise/jpi/v1/impac/kpis_controller_spec.rb

@@ -46,7 +46,7 @@ module MnoEnterprise
     end
 
     describe 'PUT #update' do
-      let(:kpi_hash) { from_api(kpi)[:data].except(:dashboard).merge(element_watched: 'New Watchable') }
+      let(:kpi_hash) { from_api(kpi)[:data].except(:dashboard).merge(name: 'New Name') }
 
       subject { put :update, id: kpi.id, kpi: kpi_hash }
 
@@ -59,7 +59,7 @@ module MnoEnterprise
 
       it "updates the kpi" do
         subject
-        expect(assigns(:kpi).element_watched).to eq('New Watchable')
+        expect(assigns(:kpi).name).to eq('New Name')
       end
 
       it { subject; expect(response.code).to eq('200') }

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

@@ -7,7 +7,7 @@ module MnoEnterprise
     before { request.env["HTTP_ACCEPT"] = 'application/json' }
 
     let!(:app) { build(:app) }
-
+    
     def markdown(text)
       return text unless text.present?
       HtmlProcessor.new(text, format: :markdown).html.html_safe
@@ -32,7 +32,8 @@ module MnoEnterprise
         'description' => markdown(app.sanitized_description),
         'testimonials' => app.testimonials,
         'pictures' => app.pictures,
-        'pricing_plans' => app.pricing_plans
+        'pricing_plans' => app.pricing_plans,
+        'rank' => app.rank
       }
     end
 
@@ -111,5 +112,45 @@ module MnoEnterprise
         expect(JSON.parse(response.body)).to eq(JSON.parse(hash_for_app(app).to_json))
       end
     end
+     
+    describe 'GET #index' do
+      subject { get :index }
+
+      context 'when multiples apps' do 
+        let(:app1) { build(:app, rank: 5 ) }
+        let(:app2) { build(:app, rank: 0 ) }
+
+        before do  
+          MnoEnterprise.marketplace_listing = nil
+          api_stub_for(get: '/apps', response: from_api([app1,app2]))
+        end
+
+        it 'is successful' do
+          subject
+          expect(response).to be_success
+        end
+
+        it 'returns the right response' do
+          subject
+          expect(JSON.parse(response.body)).to eq(JSON.parse(hash_for_apps([app2, app1]).to_json))
+        end 
+      end
+      
+      context 'when multiples apps and attributes nil' do 
+        let(:app1) { build(:app, rank: 5 ) }
+        let(:app2) { build(:app, rank: 0 ) }
+        let(:app3) { build(:app, rank: nil ) }
+
+        before do  
+          MnoEnterprise.marketplace_listing = nil
+          api_stub_for(get: '/apps', response: from_api([app1,app3,app2]))
+        end
+
+        it 'returns the right response' do
+          subject
+          expect(JSON.parse(response.body)).to eq(JSON.parse(hash_for_apps([app2, app1, app3]).to_json))
+        end   
+      end
+    end
   end
 end

data/spec/controllers/mno_enterprise/pages_controller_spec.rb

@@ -5,10 +5,6 @@ module MnoEnterprise
     render_views
     routes { MnoEnterprise::Engine.routes }
 
-    # Freeze time (JWT are time dependent)
-    before { Timecop.freeze }
-    after { Timecop.return }
-
     let(:user) { build(:user) }
     let(:app_instance) { build(:app_instance) }
 

data/spec/controllers/mno_enterprise/status_controller_spec.rb

@@ -29,10 +29,6 @@ module MnoEnterprise
       it 'returns the environment' do
         expect(data['env']).to eq('test')
       end
-
-      it 'returns the mno-api-host' do
-        expect(data['mno-api-host']).to eq('https://api-enterprise.maestrano.com')
-      end
     end
   end
 end

data/spec/controllers/mno_enterprise/webhook/o_auth_controller_spec.rb

@@ -9,10 +9,6 @@ module MnoEnterprise
     render_views
     routes { MnoEnterprise::Engine.routes }
 
-    # Freeze time (JWT are time dependent)
-    before { Timecop.freeze }
-    after { Timecop.return }
-
     # Stub controller ability
     let!(:ability) { stub_ability }
     let(:extra_params) { {some: 'param'} }
@@ -37,7 +33,7 @@ module MnoEnterprise
       it_behaves_like 'a user protected resource'
 
       it { subject; expect(response).to be_success }
-      it { subject; expect(assigns(:redirect_to)).to eq(redirect_url) }
+      it { Timecop.freeze { subject; expect(assigns(:redirect_to)).to eq(redirect_url) } }
 
       Webhook::OAuthController::PROVIDERS_WITH_OPTIONS.each do |provider|
         describe "#{provider.capitalize} provider" do

data/spec/mailer/mno_enterprise/system_notification_mailer_spec.rb

@@ -13,10 +13,10 @@ module MnoEnterprise
     def user_vars(user)
       { first_name: user.name, last_name: user.surname, full_name: "#{user.name} #{user.surname}".strip }
     end
-    
+
     def invite_vars(org_invite)
       new_user = !org_invite.user.confirmed?
-      
+
       {
         organization: org_invite.organization.name,
         team: org_invite.team ? org_invite.team.name : nil,
@@ -30,11 +30,11 @@ module MnoEnterprise
         invitee_email: org_invite.user.email,
       }
     end
-    
+
     describe 'confirmation_instructions' do
       describe 'new user' do
         it 'sends the right email' do
-          expect(MandrillClient).to receive(:deliver).with('confirmation-instructions',
+          expect(MnoEnterprise::MailClient).to receive(:deliver).with('confirmation-instructions',
             SystemNotificationMailer::DEFAULT_SENDER,
             { name: "#{user.name} #{user.surname}".strip, email: user.email },
             user_vars(user).merge(confirmation_link: routes.user_confirmation_url(confirmation_token: token))
@@ -49,7 +49,7 @@ module MnoEnterprise
         before { allow_any_instance_of(MnoEnterprise::User).to receive(:unconfirmed_email?).and_return(true) }
         
         it 'sends the right email' do
-          expect(MandrillClient).to receive(:deliver).with('reconfirmation-instructions',
+          expect(MnoEnterprise::MailClient).to receive(:deliver).with('reconfirmation-instructions',
             SystemNotificationMailer::DEFAULT_SENDER,
             { name: "#{user.name} #{user.surname}".strip, email: user.email },
             user_vars(user).merge(confirmation_link: routes.user_confirmation_url(confirmation_token: token))
@@ -58,12 +58,11 @@ module MnoEnterprise
           subject.confirmation_instructions(user,token).deliver_now
         end
       end
-      
     end
     
     describe 'reset_password_instructions' do
       it 'sends the right email' do
-        expect(MandrillClient).to receive(:deliver).with('reset-password-instructions',
+        expect(MnoEnterprise::MailClient).to receive(:deliver).with('reset-password-instructions',
           SystemNotificationMailer::DEFAULT_SENDER,
           { name: "#{user.name} #{user.surname}".strip, email: user.email },
           user_vars(user).merge(reset_password_link: routes.edit_user_password_url(reset_password_token: token))
@@ -75,7 +74,7 @@ module MnoEnterprise
     
     describe 'unlock_instructions' do
       it 'sends the right email' do
-        expect(MandrillClient).to receive(:deliver).with('unlock-instructions',
+        expect(MnoEnterprise::MailClient).to receive(:deliver).with('unlock-instructions',
           SystemNotificationMailer::DEFAULT_SENDER,
           { name: "#{user.name} #{user.surname}".strip, email: user.email },
           user_vars(user).merge(unlock_link: routes.user_unlock_url(unlock_token: token))
@@ -91,7 +90,7 @@ module MnoEnterprise
       
       context 'when invitee is a confirmed user' do
         it 'sends the right email' do
-          expect(MandrillClient).to receive(:deliver).with('organization-invite-existing-user',
+          expect(MnoEnterprise::MailClient).to receive(:deliver).with('organization-invite-existing-user',
             SystemNotificationMailer::DEFAULT_SENDER,
             { name: "#{invitee.name} #{invitee.surname}".strip, email: invitee.email },
             invite_vars(org_invite).merge(confirmation_link: routes.org_invite_url(id: org_invite.id, token: org_invite.token))
@@ -105,7 +104,7 @@ module MnoEnterprise
         let(:invitee) { build(:user, :unconfirmed) }
         
         it 'sends the right email' do
-          expect(MandrillClient).to receive(:deliver).with('organization-invite-new-user',
+          expect(MnoEnterprise::MailClient).to receive(:deliver).with('organization-invite-new-user',
             SystemNotificationMailer::DEFAULT_SENDER,
             { email: invitee.email },
             invite_vars(org_invite).merge(confirmation_link: routes.user_confirmation_url(confirmation_token: invitee.confirmation_token))
@@ -119,7 +118,7 @@ module MnoEnterprise
 
     describe 'deletion_request_instructions' do
       it 'sends the correct email' do
-        expect(MandrillClient).to receive(:deliver).with('deletion-request-instructions',
+        expect(MnoEnterprise::MailClient).to receive(:deliver).with('deletion-request-instructions',
           SystemNotificationMailer::DEFAULT_SENDER,
           { name: "#{user.name} #{user.surname}".strip, email: user.email },
           user_vars(user).merge(terminate_account_link: routes.deletion_request_url(deletion_request))
@@ -128,5 +127,18 @@ module MnoEnterprise
         subject.deletion_request_instructions(user,deletion_request).deliver_now
       end
     end
+
+    describe 'registration_instructions' do
+      it 'sends the correct email' do
+        expect(MnoEnterprise::MailClient).to receive(:deliver).with(
+            'registration-instructions',
+            SystemNotificationMailer::DEFAULT_SENDER,
+            { email: 'test@example.com' },
+            { registration_link: routes.new_user_registration_url }
+        )
+
+        subject.registration_instructions('test@example.com').deliver_now
+      end
+    end
   end
 end

data/spec/routing/mno_enterprise/jpi/v1/admin/invites_controller_routing_spec.rb

@@ -0,0 +1,11 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe Jpi::V1::Admin::InvitesController do
+    routes { MnoEnterprise::Engine.routes }
+
+    it 'routes to #create' do
+      expect(post('/jpi/v1/admin/organizations/1/users/2/invites')).to route_to('mno_enterprise/jpi/v1/admin/invites#create', organization_id: '1', user_id: '2', format: 'json')
+    end
+  end
+end

data/spec/routing/mno_enterprise/jpi/v1/admin/organizations_controller_routing_spec.rb

@@ -19,5 +19,13 @@ module MnoEnterprise
     it 'routes to #count' do
       expect(get('/jpi/v1/admin/organizations/count')).to route_to("mno_enterprise/jpi/v1/admin/organizations#count", format: 'json')
     end
+
+    it 'routes to #create' do
+      expect(post('/jpi/v1/admin/organizations')).to route_to("mno_enterprise/jpi/v1/admin/organizations#create", format: 'json')
+    end
+
+    it 'routes to #invite_member' do
+      expect(post('/jpi/v1/admin/organizations/1/users')).to route_to("mno_enterprise/jpi/v1/admin/organizations#invite_member", id: '1', format: 'json')
+    end
   end
 end

data/spec/routing/mno_enterprise/jpi/v1/admin/users_controller_routing_spec.rb

@@ -23,5 +23,9 @@ module MnoEnterprise
     it 'routes to #count' do
       expect(get('/jpi/v1/admin/users/count')).to route_to("mno_enterprise/jpi/v1/admin/users#count", format: 'json')
     end
+
+    it 'routes to #signup_email' do
+      expect(post('/jpi/v1/admin/users/signup_email')).to route_to("mno_enterprise/jpi/v1/admin/users#signup_email", format: 'json')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2016-07-13 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.0.7
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ 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/invites_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/invoices_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/organizations_controller.rb
 - app/controllers/mno_enterprise/jpi/v1/admin/tenant_invoices_controller.rb
@@ -173,11 +174,11 @@ files:
 - app/views/mno_enterprise/auth/sessions/_form.html.haml
 - app/views/mno_enterprise/auth/sessions/new.html.haml
 - app/views/mno_enterprise/auth/shared/_links.html.haml
-- app/views/mno_enterprise/auth/unlocks/_form.html.haml
 - app/views/mno_enterprise/auth/unlocks/new.html.haml
 - app/views/mno_enterprise/deletion_requests/show.html.haml
 - app/views/mno_enterprise/jpi/v1/admin/audit_events/_audit_event.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/audit_events/index.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/base_resource/_member.json.jbuilder
 - 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
@@ -186,10 +187,10 @@ files:
 - app/views/mno_enterprise/jpi/v1/admin/invoices/show.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/organizations/_credit_card.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/organizations/_invoices.json.jbuilder
-- app/views/mno_enterprise/jpi/v1/admin/organizations/_member.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/organizations/_organization.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/organizations/in_arrears.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/organizations/index.json.jbuilder
+- app/views/mno_enterprise/jpi/v1/admin/organizations/invite_member.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/organizations/show.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/tenant_invoices/_tenant_invoice.json.jbuilder
 - app/views/mno_enterprise/jpi/v1/admin/tenant_invoices/index.json.jbuilder
@@ -269,6 +270,7 @@ files:
 - spec/controllers/mno_enterprise/impersonate_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/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
 - spec/controllers/mno_enterprise/jpi/v1/admin/tenant_invoices_controller_spec.rb
@@ -299,6 +301,7 @@ files:
 - spec/routing/mno_enterprise/impersonate_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/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
 - spec/routing/mno_enterprise/jpi/v1/admin/tenant_invoices_controller_routing_spec.rb
@@ -355,6 +358,7 @@ test_files:
 - spec/routing/mno_enterprise/jpi/v1/admin/audit_events_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
 - spec/routing/mno_enterprise/jpi/v1/admin/users_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/admin/cloud_apps_controller_routing_spec.rb
 - spec/routing/mno_enterprise/jpi/v1/current_users_controller_routing_spec.rb
@@ -385,6 +389,7 @@ test_files:
 - 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/organizations_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/tenant_invoices_controller_spec.rb
 - spec/controllers/mno_enterprise/jpi/v1/admin/users_controller_spec.rb

data/app/views/mno_enterprise/auth/unlocks/_form.html.haml

@@ -1,10 +0,0 @@
-= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
-  = devise_error_messages!
-  %div
-    = f.email_field :email, :placeholder => "Email", :required => true, 'ng-model' => 'email', :class => 'form-control'
-  %br
-  %br/
-  %div
-    %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-hide' => 'hasClicked' }
-      = t('mno_enterprise.auth.unlocks.new.unlock')
-    %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }

data/app/views/mno_enterprise/jpi/v1/admin/organizations/_member.json.jbuilder

@@ -1,14 +0,0 @@
-if member.is_a?(MnoEnterprise::User)
-  json.id member.id
-  json.uid member.uid
-  json.entity 'User'
-  json.name member.name
-  json.surname member.surname
-  json.email member.email
-  json.role member.role(organization)
-elsif member.is_a?(MnoEnterprise::OrgInvite)
-  json.id member.id
-  json.entity 'OrgInvite'
-  json.email member.user_email
-  json.role member.user_role
-end