-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #480 from ditrit/bugfix/allow_folder_root_name
Bugfix: allow folder root name
- Loading branch information
Showing
53 changed files
with
747 additions
and
580 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,7 +115,7 @@ jobs: | |
| - name: Run check dependencies | ||
| run: echo '```bash' > dependencies.txt && npx ncu -x "leto-modelizer*" >> dependencies.txt && echo '```' >> dependencies.txt | ||
| - name: Post comment | ||
| uses: machine-learning-apps/pr-comment@master | ||
| uses: luukkemp/pr-comment@2024.1 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
|
|
@@ -159,7 +159,7 @@ jobs: | |
| run: | | ||
| npm install -g [email protected] && \ | ||
| npm ci && \ | ||
| npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.3.1" && \ | ||
| npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.3.2" && \ | ||
| npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.8.0" && \ | ||
| npm run plugin:init && \ | ||
| docker build -t leto-modelizer -f DockerfileE2E . | ||
|
|
||
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| Feature: Fix issue #393: File explorer is broken when creating a folder with the same name as the root folder | ||
|
|
||
| Scenario: File explorer can display a folder with the same name as the root folder | ||
| Given I clear cache | ||
| And I set viewport size to '1920' px for width and '1080' px for height | ||
| And I visit the '/' | ||
| And I wait until the application is loaded | ||
|
|
||
| # Project creation | ||
| When I click on '[data-cy="create-project-button"]' | ||
| And I set on '[data-cy="create-project-form"] [data-cy="name-input"]' text 'projectName' | ||
| And I click on '[data-cy="create-project-form"] [data-cy="submit-button"]' | ||
| Then I expect current url is 'projectName/models' | ||
|
|
||
| # Diagram creation | ||
| When I click on '[data-cy="create-diagram-button"]' | ||
| And I click on '[data-cy="create-diagram-from-scratch-button"]' | ||
| Then I expect '[data-cy="create-model-form"] [data-cy="plugin-select"]' is 'terrator-plugin' | ||
|
|
||
| When I click on '[data-cy="create-model-form"] [data-cy="submit-button"]' | ||
| Then I expect current url is 'projectName/modelizer/draw\?plugin=terrator-plugin&path=' | ||
|
|
||
| # Check project folders and files are created in Text view | ||
| When I click on '[data-cy="navigation-bar"] [data-cy="modelizer-switch-button"] [aria-pressed="false"]' | ||
| And I wait 1 second | ||
| Then I expect current url is 'projectName/modelizer/text\?plugin=terrator-plugin&path=' | ||
| And I expect '[data-cy="file-explorer"] [data-cy="folder_projectName"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/new_file.tf"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/README.md"]' exists | ||
|
|
||
| # Create "projectName" sub-folder in Text view and check folders and files still exist | ||
| When I hover '[data-cy="file-explorer"] [data-cy="folder-button_projectName"]' to make it visible | ||
| And I click on '[data-cy="file-explorer"] [data-cy="folder-button_projectName"]' | ||
| And I click on '[data-cy="create-folder-action-item"]' | ||
| And I set on '[data-cy="create-file-form"] [data-cy="name-input"]' text 'projectName' | ||
| And I click on '[data-cy="create-file-form"] [data-cy="submit-button"]' | ||
| And I wait 1 second | ||
| Then I expect '[data-cy="file-explorer"] [data-cy="folder_projectName/projectName"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/new_file.tf"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/README.md"]' exists |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| Feature: Fix issue #474: Delete last component of model file, the file is deleted and model is no longer displayed in the list | ||
|
|
||
| Scenario: Delete last component of model file should not delete the model | ||
| Given I clear cache | ||
| And I set viewport size to '1920' px for width and '1080' px for height | ||
| And I visit the '/' | ||
| And I wait until the application is loaded | ||
|
|
||
| # Project creation | ||
| When I click on '[data-cy="create-project-button"]' | ||
| And I set on '[data-cy="create-project-form"] [data-cy="name-input"]' text 'projectName' | ||
| And I click on '[data-cy="create-project-form"] [data-cy="submit-button"]' | ||
| Then I expect current url is 'projectName/models' | ||
|
|
||
| # Model creation | ||
| When I click on '[data-cy="create-diagram-button"]' | ||
| And I click on '[data-cy="create-diagram-from-scratch-button"]' | ||
| Then I expect '[data-cy="create-model-form"] [data-cy="plugin-select"]' is 'terrator-plugin' | ||
|
|
||
| When I click on '[data-cy="create-model-form"] [data-cy="submit-button"]' | ||
| Then I expect current url is 'projectName/modelizer/draw\?plugin=terrator-plugin&path=' | ||
|
|
||
| # Click on component | ||
| When I click on '[data-cy="component-definitions-item_terrator-plugin"]' | ||
| And I wait 1 second | ||
| And I click on '[data-cy="component-definition_server"]' | ||
| And I wait 2 seconds | ||
| Then I expect '[data-cy="draw-container"]' exists | ||
| And I wait 1 second | ||
| And I expect '[id^="id_1"]' exists | ||
|
|
||
| # Check project folders and files are created in Text view | ||
| When I click on '[data-cy="navigation-bar"] [data-cy="modelizer-switch-button"] [aria-pressed="false"]' | ||
| And I wait 1 second | ||
| Then I expect current url is 'projectName/modelizer/text\?plugin=terrator-plugin&path=' | ||
| And I expect '[data-cy="file-explorer"] [data-cy="folder_projectName"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/new_file.tf"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/README.md"]' exists | ||
| And I expect '[data-cy="file-tabs-container"] [data-cy="active-tab"]' appear 1 time on screen | ||
| And I expect '[data-cy="file-tabs-container"] [data-cy="active-tab"]' is 'new_file.tf' | ||
|
|
||
| # Go to Draw view and delete component | ||
| When I click on '[data-cy="navigation-bar"] [data-cy="modelizer-switch-button"] [aria-pressed="false"]' | ||
| And I wait 1 second | ||
| Then I expect current url is 'projectName/modelizer/draw\?plugin=terrator-plugin&path=' | ||
|
|
||
| When I click on '[data-cy="draw-container"] [id^="id_1"]' | ||
| And I wait 1 second | ||
| Then I expect '[id^="remove-component"]' exists | ||
|
|
||
| When I force click on '[id^="remove-component"]' | ||
| And I wait 1 second | ||
| Then I expect '[data-cy="draw-container"] [id^="id_1"]' not exists | ||
|
|
||
| # Go to Text view and check default file exists | ||
| When I click on '[data-cy="navigation-bar"] [data-cy="modelizer-switch-button"] [aria-pressed="false"]' | ||
| And I wait 1 second | ||
| Then I expect current url is 'projectName/modelizer/text\?plugin=terrator-plugin&path=' | ||
| And I expect '[data-cy="file-explorer"] [data-cy="folder_projectName"]' exists | ||
| And I expect '[data-cy="file-explorer"] [data-cy="file_projectName/new_file.tf"]' exists | ||
|
|
||
| # Check model is still displayed in the list | ||
| When I click on '[data-cy="models-page-link-button"]' | ||
| Then I expect current url is '{{ projectName }}/models' | ||
| And I expect '[data-cy="diagram-table"]' exists | ||
| And I expect '[data-cy="diagram-path_"]' exists |
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
Oops, something went wrong.