Commit Graph

150 Commits (f2ee3bf834bab3d4f4e0bd1f6b73aef8063dba34)

Author SHA1 Message Date
Igor Ohrimenko 49f5cda100 Add method 'getUserPublicEmail' to TestGitHubServiceClient (#6866) 2017-10-24 11:48:39 +03:00
Max Shaposhnik 1e87b85742 Rename wsmaster.war into api.war and remove corresponding rewrite valve; (#6917) 2017-10-24 11:32:47 +03:00
Maxim Musienko b30a78c818 Simplify some steps in the test for increasing stability (#6895)
* simplify some steps in the test for increasing stability
2017-10-24 10:16:10 +03:00
Sergey Skorik 9efc20c0d0 Extend NavigateToFileTest selenium test
added test method for checking that files from hidden folders are not appear in list of found files
2017-10-23 17:00:48 +03:00
Aleksandr Shmaraiev 6fa555d475 Selenium: Adapt the 'FindTextFeatureTest' according to 'che6' branch (#6897)
* Adapt the selenium test 'FindTextFeatureTest' according to client on 'che6' branch
* Change names and locators into 'FindText' page object
* Change names and locators into 'Consoles' page object
* Create the 'PanelSelector' page object
* Add selenium test 'ImportProjectIntoSpecifiedBranchTest' to main tests suite
2017-10-23 14:36:37 +03:00
Sergey Skorik 0f92112084 Fix Dashboard selenium tests
changed timeouts for waiting statuses of workspace, reworked WorkspaceDetailsTest for che6
2017-10-23 14:22:36 +03:00
Dmytro Nochevnov a1e2562db2 Clean up svn reaources from selenium tests (#6883)
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2017-10-21 10:25:29 +03:00
Florent BENOIT 3f262e620e Cleanup some Mockito deprecated usage (che6) (#6864)
* Cleanup some Mockito deprecated usage
org.mockito.Matchers —> org.mockito.ArgumentMatchers
org.mockito.runners.MockitoJUnitRunner —> org.mockito.junit.MockitoJUnitRunner

Change-Id: Icf7351cb58e0f42fa95885c2d2cf6b5e98206c35
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-21 09:07:43 +02:00
Dmytro Nochevnov bda6d136c3 Add ability to setup test workspace pool size in selenium tests (#6853) 2017-10-20 17:46:05 +02:00
Sergey Skorik 6abe909e89 Fix CheckRestoringOfSplitEditor selenium test(che6) 2017-10-20 17:34:16 +03:00
Florent BENOIT 6a95b6d74a Apply google format v1.4 https://github.com/google/google-java-format/releases/tag/google-java-format-1.4
Change-Id: I5df30c23165df1fd39eef4c57893bebd1d681c1d
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-19 22:23:04 +02:00
Aleksandr Shmaraiev 260116459f Selenium: Delete the package 'subversion' from project according to 'che6' branch (#6851)
* Delete the package 'subversion' from project according to 'che6' branch
* Delete selenium tests of subversion package from test suite
2017-10-19 15:09:07 +00:00
Maxim Musienko 9e8d987d7b Change steps in the test and rework depended Page Object for increasing stability tests (#6808) (#6826)
add steps and changes to Page Object for increasing stability tests
2017-10-19 17:37:00 +03:00
Sergii Kabashniuk f4cc97acce Set next version 6.0.0-M1-SNAPSHOT 2017-10-19 13:53:40 +03:00
Sergii Kabashniuk 2cd07f1369 Merge with master
modified:   ../../dashboard/src/app/workspaces/workspace-status/workspace-status.html
	modified:   ../../selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/DashboardWorkspace.java
	modified:   ../../selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/RenameWorkspaceTest.java
	modified:   ../../selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/WorkspaceDetailsTest.java
2017-10-19 13:13:08 +03:00
Sergey Skorik 3394b78e54 Fix WorkspaceDetailsTest selenium test (#6706)
* added timeout for switching agents, changed locator for status of workspace, added new agent(Yaml language server) for testing
* changed method in RenameWorkspaceTest selenium test for checking that workspace status is starting
2017-10-19 06:35:56 +00:00
Sergii Kabashniuk 40f574871c Merge master into che6 (#6787)
* Fix FindTextFeatureTest selenium test (#6762)

* added timeout for closing the 'Search' loader before checking that FindText form is closed

* Allow to disable require update password for default admin user (#6777)

* Apply fixes to update maven plugins
- errorprone : ignore test methods that are using testxyz() pattern but are not annotated by @Test
- Remove  deprecated stuff (for example use descriptors/descriptor for maven-assembly plugin
- remove dependency with specific version
- remove unnecessary stubbing

Change-Id: I64e96c0465dc9081ed9dde6841ca9f77fb515005
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>

* No proxy handling (#6775)

* Fix setting empty no_proxy

Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>

* Fix setting empty no_proxy

Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>

* Fix typo

* Skip github api requests in keycloak interceptor

Signed-off-by: Anna Shumilova <ashumilo@redhat.com>

* Dashboard: added the validation of a factory name's uniqueness (#6758)

* CHE-5462: add unique-factory-name validation directive.

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>

* CHE-5462: use validation directive for factory name's uniqueness.

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>

* CHE-6545: Add condition for breakpoints (#6763)

* Provide new presentation model for the tree node (#6718)

* Provide new presentation model for the tree node

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Add missing HasNewPresentation interface

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Increase login page load timeout in selenium tests (#6794)

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

* Fix problem with open factory page in the selenium tests (#6789)

* fixup! Merge with master
2017-10-18 16:55:21 +03:00
Vitalii Parfonov 9a03a8368f Fix after PlainJavaProjectConfigureClasspathTest 9581a9bbef (#6800)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-10-18 16:36:58 +03:00
Vitalii Parfonov f5c0f86364 Fix after PlainJavaProjectConfigureClasspathTest 9581a9bbef (#6799)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-10-18 16:36:30 +03:00
Aleksandr Shmaraiev 914e46e05c Add changes to selenium test
Delete the 'SnapshotTest' as unused according to 'che6'
Add the wating a notification to the 'ConfigureSomeSourceFoldersTest'
2017-10-18 12:42:56 +00:00
Anatoliy Bazko d3278187fb CHE-6545: Add condition for breakpoints (#6763) (#6786) 2017-10-18 11:46:00 +00:00
Igor Ohrimenko 2caee22ecb Fix problem with open factory page in the selenium tests (#6789) 2017-10-18 14:41:14 +03:00
Dmytro Nochevnov 1e3afa6f40 Increase login page load timeout in selenium tests (#6794)
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2017-10-18 13:07:10 +02:00
Anatoliy Bazko 2ce3bca97e CHE-6545: Add condition for breakpoints (#6763) 2017-10-18 07:56:06 +00:00
Roman Iuvshyn 7f6ec2e409 Allow to disable require update password for default admin user (#6780)
* Fix FindTextFeatureTest selenium test (#6762)

* Allow to disable require update password for default admin user
2017-10-17 23:48:15 +03:00
Florent BENOIT 7a3bb3f5b7 Apply fixes to update maven plugins
- errorprone : ignore test methods that are using testxyz() pattern but are not annotated by @Test
- Remove  deprecated stuff (for example use descriptors/descriptor for maven-assembly plugin
- Remove unnecessary stubbing
- fix dependencies

Change-Id: I16f512fc3bfd542463d3b0d3c062f45ceb5ac6b2
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-17 21:44:00 +02:00
Florent BENOIT 529ac3d400 Apply fixes to update maven plugins
- errorprone : ignore test methods that are using testxyz() pattern but are not annotated by @Test
- Remove  deprecated stuff (for example use descriptors/descriptor for maven-assembly plugin
- remove dependency with specific version
- remove unnecessary stubbing

Change-Id: I64e96c0465dc9081ed9dde6841ca9f77fb515005
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-17 21:41:57 +02:00
Sergey Skorik 1ba6316d42 Fix FindTextFeatureTest selenium test (#6762)
* added timeout for closing the 'Search' loader before checking that FindText form is closed
2017-10-17 12:07:35 +00:00
Sergii Kabashniuk e321ab00b1 Merge with master 2017-10-15 14:33:47 +03:00
Florent BENOIT 9581a9bbef Move to mockito 2.10
Some changes are required like
 - anyString() --> nullable(String.class) for many tests as in fact we provide null values
 - add class for VerificationMode as there are more than one method now (can't use lambdas)
 - remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
 - remove unecessary stubbing (mockito is now reporting un-needed stubs)

Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-15 10:34:15 +02:00
Roman Iuvshyn abe3271908 RELEASE: Set next development version (#6692)
* RELEASE: Set next development version
2017-10-14 20:17:04 +03:00
Oleksandr Garagatyi 03cb20ad64 Merge branch 'master' into che6
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-10-14 17:00:09 +03:00
Dmytro Nochevnov a2b4d732a5 Add ability to inject different webdrivers into the Entrance class (#6714)
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2017-10-13 16:00:22 +02:00
Sergey Skorik 76cdcee5c6 Fix locators in DasboardWorkspace page object
* fix locators for finding workspace by name from the Workspaces list and status of workspace
2017-10-13 12:38:57 +00:00
Igor Ohrimenko 6019a0c8f4 rework selenium tests in organization package (#6717) 2017-10-13 15:21:44 +03:00
Sergii Kabashniuk 1a12850c51 Merge remote-tracking branch 'origin/master' into che6 2017-10-13 09:20:16 +03:00
Anton Korneta b45072627f Add check whether refresh token is expired or not 2017-10-12 17:35:06 +03:00
Aleksandr Shmaraiev 56d80a65fd Add changes to selenium
Add the loader into two methods in the 'Refactor' to increase stability
Add the loader into 'Eclipse0120Test' to increase stability
2017-10-12 14:27:18 +00:00
Sergii Kabashniuk f1e0592348 Merge remote-tracking branch 'origin/master' into spi 2017-10-12 13:26:27 +03:00
Sergey Skorik 21e73d4942 Create a selenium test for testing workspace details page (#6516)
* added id and attributes to web elements on Workspace details page
* created WorkspaceDetailsTest test
2017-10-12 07:56:38 +00:00
Aleksandr Shmaraiev cc77f4f424 Adapt selenium tests according to SPI branch (#6664)
* Adapt existing selenium tests according to changes in the SPI branch in the next packages   
   * editor
   * intelligencecommand
   * preferences
   * editor.autocomplete
   * miscellaneous

* Adapt new selenium tests and one reworking test from 'git' package
   * GitChangeMarkersTest
   * GitColorsTest
   * KeepDirectoryGitImportTest

*  Add changes to page objects
   * FindUsages
   * MultiSplitPanel
   * Refactor
2017-10-11 08:57:25 +00:00
Artem Zatsarynnyi 22c21265aa Merge branch 'master' into spi 2017-10-11 10:16:43 +03:00
Aleksandr Shmaraiev a3c25343fd Selenium tests: Change locator of the editor (#6662)
* Change locators in the 'CodenvyEditor' after resolve merge conflict 'master' branch into 'spi' branch
2017-10-10 14:55:01 +00:00
Sergey Skorik 3291438d32 deleted all selenium tests from dashboard.stacks package 2017-10-10 12:01:52 +03:00
Dmytro Nochevnov 03d5e47b4d Fix URL with selenium test report on CI (#6644)
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2017-10-10 10:20:07 +03:00
Anatoliy Bazko f231fc1171 CHE-4536: Prevent removing breakpoint annotations (#6588) 2017-10-10 09:34:10 +03:00
Sergey Skorik 3a85e52156 Merge pull request #6632 from eclipse/fixCheckBasicFunctionalityInCommandsExplorerTest
Fix unstable CheckBasicFunctionalityInCommandsExplorerTest selenium test
2017-10-09 16:19:30 +03:00
Sergey Skorik 61b0a1f857 waiting for element in cloneCommandByName method changed to elementToBeClickable 2017-10-09 15:06:30 +03:00
Sergii Leshchenko 03934a0804 Merge remote-tracking branch 'origin/master' into spi
# Conflicts:
#	assembly-multiuser/assembly-wsmaster-war/pom.xml
#	assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MachineAuthModule.java
#	assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MultiUserCheWsMasterModule.java
#	assembly-multiuser/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
#	assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/CheWsMasterModule.java
#	assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
#	dashboard/src/app/admin/user-management/user-details/user-details.html
#	dashboard/src/app/organizations/organization-details/organization-details.html
#	dashboard/src/app/teams/team-details/team-details.html
#	dashboard/src/components/api/workspace/che-workspace.factory.ts
#	dockerfiles/init/manifests/che.env
#	dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh
#	dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_postgres_is_available.sh
#	ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/jsonrpc/WorkspaceMasterJsonRpcInitializer.java
#	ide/che-core-ide-stacks/src/main/resources/stacks.json
#	ide/che-core-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java
#	multiuser/api/che-multiuser-api-resource/pom.xml
#	multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java
#	multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTracker.java
#	multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManager.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java
#	multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/TestObjects.java
#	multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
#	multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java
#	multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/TestObjectsFactory.java
#	multiuser/integration-tests/che-multiuser-cascade-removal/src/test/resources/META-INF/persistence.xml
#	multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
#	multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java
#	multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/resources/META-INF/persistence.xml
#	multiuser/keycloak/che-multiuser-keycloak-ide/src/main/java/org/eclipse/che/multiuser/keycloak/ide/KeycloakProvider.java
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineAsyncRequestFactory.java
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineTokenServiceClientImpl.java
#	multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/inject/MachineAuthGinModule.java
#	multiuser/machine-auth/che-multiuser-machine-authentication/src/main/java/org/eclipse/che/multiuser/machine/authentication/server/MachineSessionInvalidator.java
#	multiuser/permission/che-multiuser-permission-machine/pom.xml
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilter.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDao.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDao.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserMachineJpaModule.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/listener/RemoveRecipeOnLastUserRemovedEventSubscriber.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProvider.java
#	multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipePermissionsImpl.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDaoTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaTestModule.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDaoTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/RemovePermissionsBeforeRecipeRemovedEventSubscriberTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/TestWorkspaceEntity.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProviderTest.java
#	multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/spi/tck/RecipePermissionsDaoTest.java
#	multiuser/permission/che-multiuser-permission-workspace/pom.xml
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/MultiuserWorkspaceJpaModule.java
#	multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/WorkspaceTckModule.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/JpaTckModule.java
#	multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/RemovePermissionsBeforeStackRemovedEventSubscriberTest.java
#	multiuser/pom.xml
#	plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
#	plugins/plugin-docker/pom.xml
#	plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
#	pom.xml
#	selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/workspace/TestWorkspaceProviderImpl.java
#	selenium/che-selenium-test/README.md
#	selenium/che-selenium-test/pom.xml
#	selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CodenvyEditor.java
#	selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/CreateWorkspaceOnDashboardTest.java
#	selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithNodeWsTest.java
#	selenium/che-selenium-test/src/test/resources/conf/selenium.properties
#	wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
#	wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
#	wsmaster/che-core-api-user/pom.xml
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/environment/server/MachineLinksInjector.java
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceServiceLinksInjector.java
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
#	wsmaster/integration-tests/postgresql-tck/pom.xml
2017-10-09 14:51:25 +03:00
Dmytro Nochevnov e14bf51b60 Increase max number of chromenode sessions in selenium tests (#6623)
Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
2017-10-09 14:09:28 +03:00