From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Tue, 17 Dec 2019 15:58:04 +0000 (+0100)
Subject: SONAR-12632 Remove SonarCloud tutorial
X-Git-Tag: 8.2.0.32929~111
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fbdbdb7a1fea9f44c5f434cd22586ded6ec74e03;p=sonarqube.git

SONAR-12632 Remove SonarCloud tutorial
---

diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx
index d1f0b7412c9..e873d687706 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx
@@ -21,11 +21,9 @@ import * as React from 'react';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import InstanceMessage from '../../../components/common/InstanceMessage';
 import { isVSTS } from '../../../helpers/almIntegrations';
-import { isSonarCloud } from '../../../helpers/system';
 import ProjectAnalysisStep from '../components/ProjectAnalysisStep';
 import TokenStep from '../components/TokenStep';
 import '../styles.css';
-import AnalyzeTutorialSuggestion from './AnalyzeTutorialSuggestion';
 
 export enum Steps {
   ANALYSIS,
@@ -67,8 +65,6 @@ export default class AnalyzeTutorial extends React.PureComponent<Props, State> {
           </p>
         </div>
 
-        {isSonarCloud() && <AnalyzeTutorialSuggestion almKey={almKey} />}
-
         {!isVSTS(almKey) && (
           <>
             <TokenStep
@@ -85,7 +81,6 @@ export default class AnalyzeTutorial extends React.PureComponent<Props, State> {
               component={component}
               displayRowLayout={true}
               open={step === Steps.ANALYSIS}
-              organization={isSonarCloud() ? component.organization : undefined}
               stepNumber={2}
               token={token}
             />
diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorial-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorial-test.tsx
index 5a2fdfa6043..4c4344fe56a 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorial-test.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorial-test.tsx
@@ -21,10 +21,6 @@ import { shallow } from 'enzyme';
 import * as React from 'react';
 import AnalyzeTutorial from '../AnalyzeTutorial';
 
-jest.mock('../../../../helpers/system', () => ({
-  isSonarCloud: jest.fn().mockReturnValue(true)
-}));
-
 Date.now = jest.fn().mockReturnValue(1540457859031);
 
 const component = {
diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorial-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorial-test.tsx.snap
index a0296d11683..c4b2f7a3b43 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorial-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorial-test.tsx.snap
@@ -18,7 +18,6 @@ exports[`renders correctly 1`] = `
       />
     </p>
   </div>
-  <AnalyzeTutorialSuggestion />
   <TokenStep
     currentUser={
       Object {
@@ -50,7 +49,6 @@ exports[`renders correctly 1`] = `
     }
     displayRowLayout={true}
     open={false}
-    organization="org"
     stepNumber={2}
   />
 </Fragment>