Merge branch 'master' into release

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_Data_point_spec.js

@@ -13,6 +13,7 @@ describe("Chart Widget Functionality", function() {
 
   it("Input widget test with default value from chart datapoint", function() {
     cy.SearchEntityandOpen("Input1");
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(500);
     cy.get(widgetsPage.defaultInput).type(testdata.bindChardData);
     cy.get(commonlocators.editPropCrossButton).click();
@@ -27,6 +28,7 @@ describe("Chart Widget Functionality", function() {
     cy.SearchEntityandOpen("Chart1");
     cy.addAction(testdata.bindingDataPoint);
     cy.closePropertyPane();
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(500);
     cy.xpath("(//*[local-name()='rect'])[13]")
       .first()
@@ -37,6 +39,7 @@ describe("Chart Widget Functionality", function() {
       .then(($value) => {
         const text = $value;
         cy.log(text);
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
         cy.wait(3000);
         cy.get(".t--toast-action span")
           .first()

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_Default_spec.js

@@ -34,6 +34,7 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
   });
   it("Datepicker default date validation with js binding", function() {
     cy.PublishtheApp();
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(10000);
   });
 });

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js

@@ -74,6 +74,7 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
 
   it("Datepicker default date validation with js binding", function() {
     cy.PublishtheApp();
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(10000);
   });
 });

app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_Mustache_spec.js

@@ -17,6 +17,7 @@ describe("Moustache test Functionality", function() {
     cy.CreateAPI("TestAPINew");
     cy.log("Creation of API Action successful");
     cy.enterDatasourceAndPath(testdata.baseUrl, testdata.moustacheMethod);
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(300);
     cy.RunAPI();
     cy.ResponseStatusCheck(testdata.successStatusCode);

app/server/appsmith-plugins/redshiftPlugin/src/test/java/com/external/plugins/RedshiftPluginTest.java

@@ -17,30 +17,30 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.Mockito;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import org.mockito.Mockito;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.mock;
 
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Time;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Date;
-import java.sql.Time;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for the RedshiftPlugin

contributions/docs/UploadingAssets.md

@@ -8,6 +8,8 @@ Images are gifs can be embedded into a page using the following syntax
 ```
 ![Click to expand](/.gitbook/assets/asset-name.png)
 ```
+The images should be focused on the content and not include unnecessary parts of the UI ex. header / empty canvas etc.
+Gifs can be recorded using the a screen recorder like loom and converted to a gif using gifski. Gifs should be of 26 - 30 fps and be of high quality. If you do not have access to a good gif converter, please upload the video as is and raise a PR. We will be happy to help with Gif creation!
 
 ## Embedding Videos
 Videos must be uploaded to the appsmith youtube channel. Contact nikhil@appsmith.com to have your video uploaded.