[MNOE-406] Added logic to load delisted apps if already in dashboard #644
+19
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MAhsenArif
force-pushed
the
delisted_apps_logo
branch
from
bac6619 to
28eddde
Compare
ouranos
reviewed
Feb 9, 2018
| @@ -23,6 +23,7 @@ end | |||
| # json.connector_version app_instance.oauth_keys[:version] | |||
| # end | |||
|
|
|||
| app_instance.without_tenant = true if params[:data] && params[:data] == 'unscoped' | |||
There was a problem hiding this comment.
You could use unscoped as the params and it'd be:
app_instance.without_tenant = params[:unscoped].present?
ouranos
reviewed
Feb 19, 2018
MAhsenArif
force-pushed
the
delisted_apps_logo
branch
from
2acf831 to
a792bf1
Compare
ouranos
reviewed
Feb 22, 2018
| context 'with unscoped data' do | ||
| before { allow_any_instance_of(MnoEnterprise::AppInstance).to receive(:without_tenant).and_return(true) } | ||
|
|
||
| it 'retrived the app instance with the app' do |
|
|
||
| before do | ||
| organizations = [organization] | ||
| allow(organizations).to receive(:loaded?).and_return(true) | ||
| allow_any_instance_of(MnoEnterprise::User).to receive(:organizations).and_return(organizations) | ||
| allow_any_instance_of(MnoEnterprise::AppInstance).to receive(:app).and_return(app) |
There was a problem hiding this comment.
Doesn't that mean we have a N+1 here?
- 1 Org with N App Instances
- Fetch N apps?
| context 'with unscoped data' do | ||
| before { allow_any_instance_of(MnoEnterprise::AppInstance).to receive(:without_tenant).and_return(true) } | ||
|
|
||
| it 'retrieved the app instance with the app' do |
There was a problem hiding this comment.
I don't think this spec is testing much since you're stubbing AppInstance#app
It should be something like this (comments inlined):
# remove the MnoEnterprise::AppInstance#without_tenant and MnoEnterprise::AppInstance#app stubs
context 'with unscoped data' do
subject { get :index, organization_id: organization.id, timestamp: timestamp, unscoped: true }
it 'retrieves the unscoped app' do
# Test that we do the correct request to mnohub
expect(MnoEnterprise::App).to receive(:find).with(app.id, {unscoped: true).and_return(app)
subject
# This test is pretty useless as we're testing something stubbed but let's keep it
expect(app_instance.app).to eq(app)
end
end
MAhsenArif
force-pushed
the
delisted_apps_logo
branch
4 times, most recently
from
0454c4d to
80a8e77
Compare
MAhsenArif
force-pushed
the
delisted_apps_logo
branch
from
80a8e77 to
f5c558b
Compare
BrunoChauvet
approved these changes
Mar 16, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.