mno-enterprise-frontend 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b627be5a83f12bb9b6e6bfcde051fd49aee4b356
-  data.tar.gz: f7eed0fe69d2f9e2a1b2cf4bd0d4a730eabda616
+  metadata.gz: 062c00ed02c8c9f493d108b224f941cb967ef28c
+  data.tar.gz: a6a130c7bf655737bcd48931bebaa1a472521707
 SHA512:
-  metadata.gz: 4c8687b06fd8540a147e446b5dab543ea4aca73442c367b40c021609ca6732231a73a857a98730c7e3a534f44dfc33f50a097b22c025562168f6516701384c99
-  data.tar.gz: 988cec782af69a201537ba098cda940b9348325144a29bc33d584e8dcb04305b24241f3154f1047c695a54bfa9a4159a1cba994aff0a7acfa7da77ebf247e994
+  metadata.gz: 172b1dab46d005ba870cff96b8a69e241b6c1b4aec47471e6afc88765e9196ea06484d03ac59026d0074f4ec4cd928f307409f4ab2bd882f4822cd4fffc1f293
+  data.tar.gz: e938dfd24d6fe5815f26436765bbc82297ffbd4c27ab53c151ff96132cd0b46ebefa95362a3afbccc3be830419e6a1bb3f18408121d0d13ef19355de7defd8ed

data/app/assets/templates/mno_enterprise/maestrano-components/loading_lounge.html

@@ -1,13 +1,10 @@
 <div>
 
-  <div class="spacer3 hidden-xs hidden-sm"></div>
-
-  <div class='align-center'>
-    <img ng-src="{{assetPath['mno_enterprise/main-logo.png']}}">
-    <div class="spacer2"></div>
+  <div class='text-center' style="margin-top: 45px">
+    <img ng-src="{{assetPath['mno_enterprise/main-logo-whitebg.png'] || assetPath['mno_enterprise/main-logo.png']}}">
 
     <!-- Status Details -->
-    <div ng-switch on="currentStatus()">
+    <div ng-switch on="currentStatus()" style="margin-top: 30px">
       <div ng-switch-when='online'>
         <h3 class='mgreen'>Redirecting to {{appInstance.name}}</h3>
         <h4 class='muted'>You will be automatically redirected in {{redirectionCounter}}s (or click the link below)</h4>

data/lib/tasks/mnoe_admin_tasks.rake

@@ -28,6 +28,29 @@ namespace :mnoe do
       end
     end
 
+    # Override the frontend bower.json with the locked versions
+    def override_admin_dependencies
+      resolved_version = resolve_dependencies
+      unless resolved_version
+        puts "No impac-angular override. Skipping"
+        return
+      end
+
+      frontend_bower_file = File.join(ADMIN_PANEL_PKG_FOLDER, 'bower.json')
+      File.exist?(frontend_bower_file) || raise("Frontend bower file not found.")
+
+      # Override the bowerfile
+      bower_regexp = /"impac-angular": (".*")/
+
+      # TODO: refactor
+      IO.write(frontend_bower_file, File.open(frontend_bower_file) do |f|
+        f.read.gsub(bower_regexp) do |match|
+          match.gsub!(Regexp.last_match(1), resolved_version)
+        end
+      end
+      )
+    end
+
     desc 'Setup the Enterprise Express Admin Panel'
     task :install do
       Rake::Task['mnoe:admin:add_package'].invoke
@@ -146,6 +169,10 @@ namespace :mnoe do
       # Ensure frontend is downloaded
       Rake::Task['mnoe:admin:install_frontend'].invoke unless File.directory?(ADMIN_PANEL_PKG_FOLDER)
 
+      # Override frontend dependencies
+      puts "Locking frontend dependencies"
+      override_admin_dependencies
+
       # Reset tmp folder from mnoe-admin-panel source
       rm_rf "#{admin_panel_tmp_folder}/src"
       rm_rf "#{admin_panel_tmp_folder}/e2e"

data/spec/controllers/mno_enterprise/auth/confirmations_controller_spec.rb

@@ -2,60 +2,77 @@ require 'rails_helper'
 
 module MnoEnterprise
   module Auth
-    
+
     describe ConfirmationsController, type: :controller do
       render_views
       routes { MnoEnterprise::Engine.routes }
       before { request.env["devise.mapping"] = Devise.mappings[:user] } #bypass devise router
-      
-      
+
+
       let(:user) { build(:user) }
       let(:new_email) { user.email + '.au' }
       let(:email_params) {{ filter: { email: user.email }, limit: 1 }}
       let(:new_email_params) {{ filter: { email: new_email }, limit: 1 }}
-      
+
       before { allow(MnoEnterprise::User).to receive(:find_for_confirmation).with(any_args).and_return(user) }
-      
+
       before { api_stub_for(get: "/users", params: email_params, respond_with: []) }
       before { api_stub_for(get: "/users", respond_with: [user]) }
       before { api_stub_for(get: "/org_invites", respond_with: []) }
       before { api_stub_for(get: "/users/#{user.id}/organizations", respond_with: []) }
-      
+
       before { api_stub_for(put: "/users/#{user.id}", respond_with: user) }
-      
-    
+
+
       describe 'GET #show' do
         subject { get :show, confirmation_token: user.confirmation_token }
-      
+
         describe 'confirmed user confirming new email address' do
           before { user.unconfirmed_email = new_email }
-          
+
           before { subject }
           it { expect(user.email).to eq(new_email) }
           it { expect(response).to redirect_to(root_path) }
         end
-      
+
         describe 'unconfirmed user' do
+
+          let(:tos_accepted_at) { nil }
+          before { user.meta_data[:tos_accepted_at] = tos_accepted_at }
+
           before { user.confirmed_at = nil }
           before { subject }
           it { expect(response.code).to eq('200') }
           it { expect(assigns(:confirmation_token)).to eq(user.confirmation_token) }
+
+          context 'when TOS accepted' do
+            let(:tos_accepted_at) { 1.days.ago }
+            it 'does not show the TOS checkbox' do
+              expect(response.body).not_to include('id="tos"')
+            end
+          end
+
+          context 'when TOS not accepted' do
+            it 'shows the TOS checkbox' do
+              expect(response.body).to include('id="tos"')
+            end
+          end
         end
       end
-    
+
       describe 'PATCH #finalize' do
         let(:previous_url) { nil }
         let(:user_params) {{ name: 'Robert', surname: 'Jack', password: 'somepassword', confirmation_token: user.confirmation_token }}
         subject { patch :finalize, user: user_params }
-        
+
         before { session[:previous_url] = previous_url }
-        
+
         describe 'confirmed user' do
           before { subject }
           it { expect(user.name).to_not eq(user_params[:name]) }
           it { expect(response).to redirect_to(root_path) }
         end
-        
+
         describe 'unconfirmed user' do
           before { user.confirmed_at = nil }
           before { subject }
@@ -63,13 +80,13 @@ module MnoEnterprise
           it { expect(user.surname).to eq(user_params[:surname]) }
           it { expect(user.password).to eq(user_params[:password]) }
           it { expect(response).to redirect_to(MnoEnterprise.router.dashboard_path) }
-          
+
           describe 'with previous url' do
             let(:previous_url) { "/some/redirection" }
             it { expect(response).to redirect_to(previous_url) }
           end
         end
-        
+
         describe 'invalid confirmation token ' do
           let(:user_with_errors) { obj = MnoEnterprise::User.new; obj.errors[:base] << "Invalid confirmation token"; obj }
           before { allow(MnoEnterprise::User).to receive(:find_for_confirmation).with(any_args).and_return(user_with_errors) }
@@ -79,6 +96,6 @@ module MnoEnterprise
         end
       end
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-frontend
 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,28 +17,28 @@ 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: mno-enterprise-api
   requirement: !ruby/object:Gem::Requirement
     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: less-rails
   requirement: !ruby/object:Gem::Requirement