mno-enterprise-api 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d613105f43c3f93a8376b256b3ce3b05a734c3e
-  data.tar.gz: 332b2e86714e9f13de04d67eacb7d1f2e0ab802b
+  metadata.gz: 946bdc47f1f8bc49a5186e9b31e946ee43d6138d
+  data.tar.gz: 3284bb90d1d1c4324dbcacd8dc06766eac18cb10
 SHA512:
-  metadata.gz: 89d5c43708d03e9531d7fc3b15ec67ac704409fd219ed493ed87cf128a8d6b66043c926f704ed454da446fdc6d1f4258f577571a5cc6191e6c924d34933765c1
-  data.tar.gz: 4383f8f03b6679134a3dd421267fd3fd7ac507864ee10439b2ae68c6c8e3f6b7845091682e032e82d684640f1a9800d6ff2e5b114b998e4046b9b2eae1bf668b
+  metadata.gz: 19b2e1ecd70323064db222edb817653ae82cbd9fd7b0e1737d79ea109f0410431240ae4e1805f69464dcca8a9c5209ff56fb88d360cc36d8770bc8288ec89312
+  data.tar.gz: 8846c11e6b1bf335bb454f0575952b64a27d914678ea191e943eca125805371fce6e53ecbda133f1930c926e61b2471134846a04614ca503086ef061da020168

data/app/controllers/mno_enterprise/impersonate_controller.rb

@@ -8,6 +8,7 @@ module MnoEnterprise
     # Perform the user impersonate action
     # GET /impersonate/user/123
     def create
+      session[:impersonator_redirect_path] = params[:redirect_path].presence
       @user = MnoEnterprise::User.find(params[:user_id])
       if @user.present?
         impersonate(@user)
@@ -31,7 +32,7 @@ module MnoEnterprise
       else
         flash[:notice] = "You weren't impersonating anyone"
       end
-      redirect_to '/admin/'
+      redirect_to session.delete(:impersonator_redirect_path).presence || '/admin/'
     end
 
     private

data/app/controllers/mno_enterprise/jpi/v1/app_instances_sync_controller.rb

@@ -1,5 +1,6 @@
 module MnoEnterprise
   class Jpi::V1::AppInstancesSyncController < Jpi::V1::BaseResourceController
+    CONNECTOR_STATUS_RUNNING = ['PENDING', 'RUNNING']
 
     # GET /mnoe/jpi/v1/organization/org-fbba/app_instances_sync
     def index
@@ -28,9 +29,8 @@ module MnoEnterprise
       def results(connectors)
         {
           connectors: connectors,
-          is_syncing: connectors.any?{|c| c[:status]=="RUNNING" }
+          is_syncing: connectors.any? { |c| CONNECTOR_STATUS_RUNNING.include?(c[:status]) }
         }
       end
-
   end
 end

data/app/controllers/mno_enterprise/status_controller.rb

@@ -13,13 +13,15 @@ module MnoEnterprise
     #   {
     #     'app-version': '9061048-6811c4a',
     #     'mno-enterprise-version': '0.0.1',
-    #     'env': 'test'
+    #     'env': 'test',
+    #     'mno-api-host': 'https://uat.maestrano.io'
     #   }
     def version
       data = {
           'app-version' => MnoEnterprise::APP_VERSION,
           'mno-enteprise-version' => MnoEnterprise::VERSION,
-          'env' => Rails.env
+          'env' => Rails.env,
+          'mno-api-host' => MnoEnterprise.mno_api_host
       }
       render json: data
     end

data/app/views/mno_enterprise/jpi/v1/impac/kpis/_kpi.json.jbuilder

@@ -1 +1 @@
-json.extract! kpi, :id, :name, :element_watched, :endpoint, :source, :targets, :settings, :extra_params
+json.extract! kpi, :id, :element_watched, :endpoint, :source, :targets, :settings, :extra_params

data/spec/controllers/mno_enterprise/impersonate_controller_spec.rb

@@ -22,8 +22,6 @@ module MnoEnterprise
       end
 
       describe "#create" do
-
-
         it do
           expect(controller.current_user.id).to eq(user.id)
           get :create, user_id: user2.id
@@ -32,17 +30,24 @@ module MnoEnterprise
       end
 
       describe "#destroy" do
-        before do
-          get :create, user_id: user2.id
-        end
+        subject { get :destroy }
 
-        it { expect(controller.current_user.id).to eq(user2.id) }
+        context 'without redirect_path' do
+          before { get :create, user_id: user2.id }
 
-        subject { get :destroy }
+          it { expect(controller.current_user.id).to eq(user2.id) }
 
-        it { subject; expect(controller.current_user.id).to eq(user.id) }
+          it { subject; expect(controller.current_user.id).to eq(user.id) }
+
+          it { is_expected.to redirect_to('/admin/') }
+        end
+
+        context 'with a redirect_path' do
+          before { get :create, user_id: user2.id, redirect_path: '/admin/redirect#path' }
+
+          it { is_expected.to redirect_to('/admin/redirect#path') }
+        end
       end
     end
   end
-
 end

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

@@ -74,6 +74,14 @@ module MnoEnterprise
         before { subject }
         it { expect(JSON.parse(response.body)['is_syncing']).to be_falsey }
       end
+
+      context "when connector is pending" do
+        let(:progress_results) { { connectors: [
+          HashWithIndifferentAccess.new({name: 'a_name', status: 'PENDING', date: nil})
+        ] } }
+        before { subject }
+        it { expect(JSON.parse(response.body)['is_syncing']).to be_truthy }
+      end
     end
 
     describe "POST #create" do

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

data/spec/controllers/mno_enterprise/status_controller_spec.rb

@@ -29,6 +29,10 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-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: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Maestrano Enterprise - API