mno-enterprise-core 3.2.1 → 3.3.0

data/lib/mno_enterprise/testing_support/organizations_shared_helpers.rb

@@ -31,7 +31,7 @@ module MnoEnterprise::TestingSupport::OrganizationsSharedHelpers
           'email' => user.email,
           'role' => user.role(organization)
       }
-      u.merge!('uid' => user.uid) if admin
+      u['uid'] = user.uid if admin
       list.push(u)
     end
 
@@ -53,13 +53,12 @@ module MnoEnterprise::TestingSupport::OrganizationsSharedHelpers
         'id' => organization.id,
         'name' => organization.name,
         'soa_enabled' => organization.soa_enabled,
+        'account_frozen' => organization.account_frozen,
         'payment_restriction' => organization.payment_restriction
     }
 
     if admin
-      ret.merge!({
-                     'uid' => organization.uid
-                 })
+      ret['uid'] = organization.uid
     end
 
     ret
@@ -115,9 +114,7 @@ module MnoEnterprise::TestingSupport::OrganizationsSharedHelpers
         'organization' => partial_hash_for_organization(organization),
         'current_user' => partial_hash_for_current_user(organization, user)
     }
-    hash['organization'].merge!(
-        'members' => partial_hash_for_members(organization)
-    )
+    hash['organization']['members'] = partial_hash_for_members(organization)
 
     if user.role(organization) == 'Super Admin'
       hash.merge!(partial_hash_for_billing(organization))
@@ -138,8 +135,8 @@ module MnoEnterprise::TestingSupport::OrganizationsSharedHelpers
   def admin_hash_for_organization(organization)
     hash = {}
     hash['organization'] = partial_hash_for_organization(organization, true)
-    hash['organization'].merge!('members' => partial_hash_for_members(organization, true))
-    hash['organization'].merge!('credit_card' => {'presence' => false})
+    hash['organization']['members'] = partial_hash_for_members(organization, true)
+    hash['organization']['credit_card'] = {'presence' => false}
     hash['organization'].merge!(admin_partial_hash_for_invoices(organization))
     hash['organization'].merge!(admin_partial_hash_for_active_apps(organization))
     hash

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.2.1'
+  VERSION = '3.3.0'
 end

data/spec/config/initializers/audit_log_spec.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+describe 'AUDIT_LOG_CONFIG' do
+  # Make sure that the constant is defined
+  it { expect(AUDIT_LOG_CONFIG).to be_a Hash }
+end

data/spec/controllers/mno_enterprise/application_controller_spec.rb

@@ -13,10 +13,10 @@ module MnoEnterprise
     end
 
     describe '#add_param_to_fragment' do
-      it { expect(controller.add_param_to_fragment('/#/platform/accounts', 'foo', 'bar')).to eq('/#/platform/accounts?foo=bar') }
-      it { expect(controller.add_param_to_fragment('/', 'foo', 'bar')).to eq('/#?foo=bar') }
-      it { expect(controller.add_param_to_fragment('/#/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#/platform/dashboard/he/43?en=690&foo=bar') }
-      it { expect(controller.add_param_to_fragment('/#/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
+      it { expect(controller.add_param_to_fragment('/#!/platform/accounts', 'foo', 'bar')).to eq('/#!/platform/accounts?foo=bar') }
+      it { expect(controller.add_param_to_fragment('/', 'foo', 'bar')).to eq('/#!?foo=bar') }
+      it { expect(controller.add_param_to_fragment('/#!/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#!/platform/dashboard/he/43?en=690&foo=bar') }
+      it { expect(controller.add_param_to_fragment('/#!/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#!/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
     end
 
     describe '#after_sign_in_path_for' do

data/spec/helpers/image_helper_spec.rb

@@ -0,0 +1,69 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe ImageHelper do
+
+    let(:folder) { "/app/assets/images/mno_enterprise" }
+    let(:root) {"#{Rails.root}#{folder}"}
+    let(:path_engine_main_logo) { "#{MnoEnterprise::Engine.root}#{folder}/main-logo.png" }    
+    let(:path_main_logo) { "#{root}/main-logo.png" }
+    let(:path_main_logo_white) { "#{root}/main-logo-whitebg.png" }
+
+    describe "#main_logo_white_bg_path" do
+    
+      context "when no logos exist"  do
+
+        it "returns the engine main-logo filename" do
+          expect(helper.main_logo_white_bg_path).to match("mno_enterprise/main-logo.png")
+        end
+
+        it "returns the engine main-logo full path"  do
+          expect(helper.main_logo_white_bg_path(true)).to match(path_engine_main_logo)
+        end
+      end
+
+      context "when main-logo.png exists and main-logo-whitebg.png do not exist"  do
+        before { allow(File).to receive(:exists?).with(path_main_logo_white).and_return(false) }
+        before { allow(File).to receive(:exists?).with(path_main_logo).and_return(true) }
+        
+        it "returns the main-logo filename" do
+          expect(helper.main_logo_white_bg_path).to match("mno_enterprise/main-logo.png")
+        end
+
+        it "returns the main-logo full path"  do
+          expect(helper.main_logo_white_bg_path(true)).to match(path_main_logo)
+        end
+      end
+
+      context "when main-logo-whitebg.png exists"  do
+        before { allow(File).to receive(:exists?).with(path_main_logo_white).and_return(true) }
+        
+        it "returns the filename" do
+          expect(helper.main_logo_white_bg_path).to match("mno_enterprise/main-logo-whitebg.png")
+        end
+
+        it "returns the full path"  do
+          expect(helper.main_logo_white_bg_path(true)).to match(path_main_logo_white)
+        end
+      end
+    end
+    
+    describe "#main_logo_path" do
+
+      context "when there are no logos" do
+
+        it "returns the engines main-logo " do
+          expect(helper.main_logo_path).to match(path_engine_main_logo)
+        end
+      end
+
+      context "when main-logo.png exists"  do
+        before { allow(File).to receive(:exists?).with(path_main_logo).and_return(true) }
+
+        it "returns the full path"  do
+          expect(helper.main_logo_path).to match(path_main_logo)
+        end
+      end
+    end
+  end
+end

data/spec/models/mno_enterprise/ability_spec.rb

@@ -15,6 +15,11 @@ RSpec.describe MnoEnterprise::Ability, type: :model do
     it { is_expected.to be_able_to(:manage_app_instances, organization) }
   end
 
+  context 'when User#admin_role has a random case' do
+    let(:admin_role) { 'ADmIn' }
+    it { is_expected.to be_able_to(:manage_app_instances, organization) }
+  end
+
   context 'when no User#admin_role' do
     it { is_expected.not_to be_able_to(:manage_app_instances, organization) }
   end

data/spec/models/mno_enterprise/app_spec.rb

@@ -26,7 +26,7 @@ module MnoEnterprise
     end
 
     describe 'appinfo methods' do
-      %i(single_billing? coming_soon? add_on?).each do |method|
+      %i(single_billing? coming_soon? add_on? connec_ready? star_ready? responsive?).each do |method|
         it { expect(described_class.new).to respond_to(method) }
       end
     end

data/spec/models/mno_enterprise/base_resource_spec.rb

@@ -46,5 +46,42 @@ module MnoEnterprise
         it { expect(User.new.cache_key).to eq('mno_enterprise/users/new') }
       end
     end
+
+    # Not the best spec as this still pass without the attributes deletion
+    describe '#clear_association_cache' do
+      let(:user) { build(:user, :with_organizations) }
+      let(:dashboard) { build(:impac_dashboard) }
+
+      # Prime the cache and clear the stubs
+      before do
+        api_stub_for(get: "/users/#{user.id}/dashboards", response: from_api([dashboard]))
+        user.dashboards.count
+        user.organizations.count
+        clear_api_stubs
+      end
+
+      context 'without clearing the cache' do
+        # We can get the widget count without hitting the API
+        it 'is cached' do
+          # ivar
+          expect(user.dashboards.count).to eq(1)
+          # attribute
+          expect(user.organizations.count).to eq(1)
+        end
+      end
+
+      context 'when the cache is cleared' do
+        before { user.clear_association_cache }
+
+        # It tries to hit the API
+        it 'clears the resource cache (ivar)' do
+          expect{user.dashboards.count}.to raise_error(MnoeFaradayTestAdapter::Stubs::NotFound)
+        end
+
+        it 'clears the resource cache (attributes)' do
+          expect{user.organizations.count}.to raise_error(MnoeFaradayTestAdapter::Stubs::NotFound)
+        end
+      end
+    end
   end
 end

data/spec/models/mno_enterprise/credit_card_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  RSpec.describe CreditCard, type: :model do
+    describe '#expiry_date' do
+
+      context 'with a valid date' do
+        let(:credit_card) { build(:credit_card, year: 2020, month: 5) }
+        it { expect(credit_card.expiry_date).to eq(Date.new(2020,5,31)) }
+      end
+
+      context 'without a date' do
+        let(:credit_card) { MnoEnterprise::CreditCard.new }
+        it { expect(credit_card.expiry_date).to be nil }
+      end
+    end
+  end
+end

data/spec/models/mno_enterprise/organization_spec.rb

@@ -20,5 +20,21 @@ module MnoEnterprise
         it { is_expected.to eq(['visa']) }
       end
     end
+
+    describe '#has_credit_card_details?' do
+      let(:organization) { FactoryGirl.build(:organization) }
+      subject { organization.has_credit_card_details? }
+
+      context 'with a credit card' do
+        before { organization.credit_card = FactoryGirl.build(:credit_card) }
+        it { is_expected.to be true }
+      end
+
+      context 'without a credit card' do
+        # Her return a new object if non existing
+        before { organization.credit_card = MnoEnterprise::CreditCard.new }
+        it { is_expected.to be false }
+      end
+    end
   end
 end

data/spec/models/mno_enterprise/shared_entity_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+require 'shoulda/matchers'
+
+module MnoEnterprise
+  RSpec.describe SharedEntity, type: :model do
+  end
+end

data/spec/models/mno_enterprise/user_spec.rb

@@ -2,6 +2,14 @@ require 'rails_helper'
 
 module MnoEnterprise
   RSpec.describe User, type: :model do
+    def reload_user
+      # Reload User class to redefine the validation
+      # Removes MnoEnterprise::User from object-space:
+      MnoEnterprise.send(:remove_const, :User)
+      # Reloads the module (require might also work):
+      load 'app/models/mno_enterprise/user.rb'
+    end
+
     describe 'password strength' do
       let(:user) do
         # Initialize this way so the class reload is taken into account (the factory doesnt reload the User class)
@@ -17,12 +25,7 @@ module MnoEnterprise
       context 'with password regex' do
         before do
           Devise.password_regex = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])/
-
-          # Reload User class to redefine the validation
-          # Removes MnoEnterprise::User from object-space:
-          MnoEnterprise.send(:remove_const, :User)
-          # Reloads the module (require might also work):
-          load 'app/models/mno_enterprise/user.rb'
+          reload_user
         end
 
         it 'validates the password strength' do
@@ -39,12 +42,18 @@ module MnoEnterprise
       end
     end
 
-    describe :intercom_user_hash do
-      let(:user) { MnoEnterprise::User.new(email: 'admin@example.com') }
-
+    describe 'IntercomUser' do
       context 'without Intercom' do
         # default
-        it { expect(user).not_to respond_to(:intercom_user_hash) }
+        let(:user) { MnoEnterprise::User.new(email: 'admin@example.com') }
+
+        describe :intercom_data do
+          it { expect(user).not_to respond_to(:intercom_data) }
+        end
+
+        describe :intercom_user_hash do
+          it { expect(user).not_to respond_to(:intercom_user_hash) }
+        end
       end
 
       context 'with Intercom' do
@@ -56,16 +65,43 @@ module MnoEnterprise
           MnoEnterprise.send(:remove_const, :User)
           load 'app/models/mno_enterprise/user.rb'
         end
-
-        it 'returns the user intercom hash' do
-          expect(user.intercom_user_hash).not_to be_nil
-        end
-
         after do
           # Reset to default
           MnoEnterprise.send(:remove_const, :User)
           load 'app/models/mno_enterprise/user.rb'
         end
+
+        let(:user) { MnoEnterprise::User.new(attributes_for(:user, admin_role: 'admin')) }
+
+        describe :intercom_user_hash do
+          it 'returns the user intercom secure hash' do
+            expect(user.intercom_user_hash).not_to be_nil
+          end
+        end
+
+        describe :intercom_data do
+          let(:expected) {
+            {
+              user_id: user.id,
+              name: [user.name, user.surname].join(' '),
+              email: user.email,
+              created_at: user.created_at.to_i,
+              last_seen_ip: user.last_sign_in_ip,
+              custom_attributes: {
+                first_name: user.name,
+                surname: user.surname,
+                confirmed_at: user.confirmed_at,
+                phone: user.phone,
+                admin_role: user.admin_role
+              },
+              update_last_request_at: true
+            }
+          }
+
+          it {
+            expect(user.intercom_data).to eq(expected)
+          }
+        end
       end
     end
 
@@ -278,5 +314,37 @@ module MnoEnterprise
         end
       end
     end
+
+    describe 'Devise' do
+      subject { MnoEnterprise::User.new }
+      describe 'registerable?' do
+        context 'default' do
+          before { reload_user }
+          it 'is registerable' do
+            expect(MnoEnterprise::User.ancestors).to include(Devise::Models::Registerable)
+          end
+        end
+
+        context 'enabled' do
+          before do
+            Settings.merge!(devise: { registration: { disabled: false } })
+            reload_user
+          end
+          it 'is registerable' do
+            expect(MnoEnterprise::User.ancestors).to include(Devise::Models::Registerable)
+          end
+        end
+
+        context 'disabled' do
+          before do
+            Settings.merge!(devise: { registration: { disabled: true } })
+            reload_user
+          end
+          it 'is not registerable' do
+            expect(MnoEnterprise::User.ancestors).not_to include(Devise::Models::Registerable)
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -328,6 +328,7 @@ files:
 - app/assets/stylesheets/mno_enterprise/mail.css
 - app/controllers/mno_enterprise/application_controller.rb
 - app/helpers/mno_enterprise/application_helper.rb
+- app/helpers/mno_enterprise/image_helper.rb
 - app/helpers/mno_enterprise/impersonate_helper.rb
 - app/models/mno_enterprise/ability.rb
 - app/models/mno_enterprise/app.rb
@@ -352,6 +353,7 @@ files:
 - app/models/mno_enterprise/invoice.rb
 - app/models/mno_enterprise/org_invite.rb
 - app/models/mno_enterprise/organization.rb
+- app/models/mno_enterprise/shared_entity.rb
 - app/models/mno_enterprise/team.rb
 - app/models/mno_enterprise/tenant.rb
 - app/models/mno_enterprise/tenant_invoice.rb
@@ -447,6 +449,7 @@ files:
 - config/locales/templates/modals/en.yml
 - config/locales/templates/modals/id.yml
 - config/locales/templates/modals/zh.yml
+- config/locales/templates/onboarding/en.yml
 - config/locales/views/auth/confirmations/en.yml
 - config/locales/views/auth/confirmations/id.yml
 - config/locales/views/auth/confirmations/zh.yml
@@ -513,6 +516,7 @@ files:
 - lib/generators/mno_enterprise/install/templates/config/settings/test.yml
 - lib/generators/mno_enterprise/install/templates/config/settings/uat.yml
 - lib/generators/mno_enterprise/install/templates/javascripts/mno_enterprise_extensions.js
+- lib/generators/mno_enterprise/install/templates/nginx.conf
 - lib/generators/mno_enterprise/install/templates/stylesheets/main.less
 - lib/generators/mno_enterprise/install/templates/stylesheets/theme.less_erb
 - lib/generators/mno_enterprise/install/templates/stylesheets/variables.less
@@ -557,6 +561,7 @@ files:
 - lib/mno_enterprise/concerns/models/app_instance.rb
 - lib/mno_enterprise/concerns/models/intercom_user.rb
 - lib/mno_enterprise/concerns/models/organization.rb
+- lib/mno_enterprise/concerns/models/shared_entity.rb
 - lib/mno_enterprise/concerns/models/team.rb
 - lib/mno_enterprise/core.rb
 - lib/mno_enterprise/database_extendable.rb
@@ -600,9 +605,11 @@ files:
 - lib/mno_enterprise/testing_support/user_action_shared.rb
 - lib/mno_enterprise/version.rb
 - lib/tasks/mno_enterprise_tasks.rake
+- spec/config/initializers/audit_log_spec.rb
 - spec/controllers/mno_enterprise/angular_csrf_spec.rb
 - spec/controllers/mno_enterprise/application_controller_spec.rb
 - spec/controllers/mno_enterprise/i18n_spec.rb
+- spec/helpers/image_helper_spec.rb
 - spec/lib/devise/model/remote_authenticable_spec.rb
 - spec/lib/her_extension/her_orm_adapter.rb
 - spec/lib/her_extension/model/relation_spec.rb
@@ -620,11 +627,13 @@ files:
 - spec/models/mno_enterprise/app_instance_spec.rb
 - spec/models/mno_enterprise/app_spec.rb
 - spec/models/mno_enterprise/base_resource_spec.rb
+- spec/models/mno_enterprise/credit_card_spec.rb
 - spec/models/mno_enterprise/deletion_request_spec.rb
 - spec/models/mno_enterprise/identity_spec.rb
 - spec/models/mno_enterprise/impac/dashboard_spec.rb
 - spec/models/mno_enterprise/invoice_spec.rb
 - spec/models/mno_enterprise/organization_spec.rb
+- spec/models/mno_enterprise/shared_entity_spec.rb
 - spec/models/mno_enterprise/user_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
@@ -657,10 +666,12 @@ test_files:
 - spec/models/mno_enterprise/organization_spec.rb
 - spec/models/mno_enterprise/app_instance_spec.rb
 - spec/models/mno_enterprise/impac/dashboard_spec.rb
+- spec/models/mno_enterprise/credit_card_spec.rb
 - spec/models/mno_enterprise/deletion_request_spec.rb
 - spec/models/mno_enterprise/identity_spec.rb
 - spec/models/mno_enterprise/ability_spec.rb
 - spec/models/mno_enterprise/invoice_spec.rb
+- spec/models/mno_enterprise/shared_entity_spec.rb
 - spec/models/mno_enterprise/user_spec.rb
 - spec/models/mno_enterprise/base_resource_spec.rb
 - spec/spec_helper.rb
@@ -680,4 +691,6 @@ test_files:
 - spec/controllers/mno_enterprise/i18n_spec.rb
 - spec/controllers/mno_enterprise/angular_csrf_spec.rb
 - spec/controllers/mno_enterprise/application_controller_spec.rb
+- spec/config/initializers/audit_log_spec.rb
 - spec/mno_enterprise_spec.rb
+- spec/helpers/image_helper_spec.rb