From 5700842ba8ca2f3100395a9fb98c759e78e63d96 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Wed, 15 Oct 2014 02:21:21 -0500 Subject: Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes. --- features/project/issues/issues.feature | 27 +++++++++++++++++++++++++++ features/project/merge_requests.feature | 31 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) (limited to 'features/project') diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 4db8551559b..e7fbe2bd6f1 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -159,3 +159,30 @@ Feature: Project Issues Given project "Shop" has "Tasks-closed" closed issue with task markdown When I visit issue page "Tasks-closed" Then Task checkboxes should be disabled + + # Issue description preview + + @javascript + Scenario: I can't preview without text + Given I click link "New Issue" + And I haven't written any description text + Then I should not see the Markdown preview button + + @javascript + Scenario: I can preview with text + Given I click link "New Issue" + And I write a description like "Nice" + Then I should see the Markdown preview button + + @javascript + Scenario: I preview an issue description + Given I click link "New Issue" + And I preview a description text like "Bug fixed :smile:" + Then I should see the Markdown preview + And I should not see the Markdown text field + + @javascript + Scenario: I can edit after preview + Given I click link "New Issue" + And I preview a description text like "Bug fixed :smile:" + Then I should see the Markdown edit button diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index d20358a7dc6..f1adf0bd34d 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -187,3 +187,34 @@ Feature: Project Merge Requests And I visit merge request page "MR-task-open" And I click link "Close" Then Task checkboxes should be disabled + + # Description preview + + @javascript + Scenario: I can't preview without text + Given I visit merge request page "Bug NS-04" + And I click link "Edit" + And I haven't written any description text + Then I should not see the Markdown preview button + + @javascript + Scenario: I can preview with text + Given I visit merge request page "Bug NS-04" + And I click link "Edit" + And I write a description like "Nice" + Then I should see the Markdown preview button + + @javascript + Scenario: I preview a merge request description + Given I visit merge request page "Bug NS-04" + And I click link "Edit" + And I preview a description text like "Bug fixed :smile:" + Then I should see the Markdown preview + And I should not see the Markdown text field + + @javascript + Scenario: I can edit after preview + Given I visit merge request page "Bug NS-04" + And I click link "Edit" + And I preview a description text like "Bug fixed :smile:" + Then I should see the Markdown edit button -- cgit v1.2.1 From e1491465de441b386c72726f0b869104d1c15680 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Thu, 16 Oct 2014 23:10:50 -0500 Subject: Refactor Markdown preview tests Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher. --- features/project/merge_requests.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'features/project') diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index f1adf0bd34d..f8a43e1ee36 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -193,21 +193,21 @@ Feature: Project Merge Requests @javascript Scenario: I can't preview without text Given I visit merge request page "Bug NS-04" - And I click link "Edit" + And I click link "Edit" for the merge request And I haven't written any description text Then I should not see the Markdown preview button @javascript Scenario: I can preview with text Given I visit merge request page "Bug NS-04" - And I click link "Edit" + And I click link "Edit" for the merge request And I write a description like "Nice" Then I should see the Markdown preview button @javascript Scenario: I preview a merge request description Given I visit merge request page "Bug NS-04" - And I click link "Edit" + And I click link "Edit" for the merge request And I preview a description text like "Bug fixed :smile:" Then I should see the Markdown preview And I should not see the Markdown text field @@ -215,6 +215,6 @@ Feature: Project Merge Requests @javascript Scenario: I can edit after preview Given I visit merge request page "Bug NS-04" - And I click link "Edit" + And I click link "Edit" for the merge request And I preview a description text like "Bug fixed :smile:" Then I should see the Markdown edit button -- cgit v1.2.1 From e06f0ead9843df2688ca2f341a3b37d4d56a955d Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Thu, 16 Oct 2014 23:36:52 -0500 Subject: Fix Markdown preview tests Update Spinach tests for Markdown previews for the new-ish tab UI that replaced the old preview/edit toggle button. --- features/project/commits/comments.feature | 8 ++++---- features/project/commits/diff_comments.feature | 6 +++--- features/project/issues/issues.feature | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'features/project') diff --git a/features/project/commits/comments.feature b/features/project/commits/comments.feature index e176752cfbf..a45245917e3 100644 --- a/features/project/commits/comments.feature +++ b/features/project/commits/comments.feature @@ -16,12 +16,12 @@ Feature: Project Commits Comments @javascript Scenario: I can't preview without text Given I haven't written any comment text - Then I should not see the comment preview button + Then The comment preview tab should say there is nothing to do @javascript Scenario: I can preview with text - Given I write a comment like "Nice" - Then I should see the comment preview button + Given I write a comment like ":+1: Nice" + Then The comment preview tab should be display rendered Markdown @javascript Scenario: I preview a comment @@ -32,7 +32,7 @@ Feature: Project Commits Comments @javascript Scenario: I can edit after preview Given I preview a comment text like "Bug fixed :smile:" - Then I should see the comment edit button + Then I should see the comment write tab @javascript Scenario: I have a reset form after posting from preview diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature index a145ec84b78..9c4cc723d1b 100644 --- a/features/project/commits/diff_comments.feature +++ b/features/project/commits/diff_comments.feature @@ -58,13 +58,13 @@ Feature: Project Commits Diff Comments Scenario: I can't preview without text Given I open a diff comment form And I haven't written any diff comment text - Then I should not see the diff comment preview button + Then The diff comment preview tab should say there is nothing to do @javascript Scenario: I can preview with text Given I open a diff comment form And I write a diff comment like ":-1: I don't like this" - Then I should see the diff comment preview button + Then The diff comment preview tab should display rendered Markdown @javascript Scenario: I preview a diff comment @@ -75,7 +75,7 @@ Feature: Project Commits Diff Comments @javascript Scenario: I can edit after preview Given I preview a diff comment text like "Should fix it :smile:" - Then I should see the diff comment edit button + Then I should see the diff comment write tab @javascript Scenario: The form gets removed after posting diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index e7fbe2bd6f1..9970be0c596 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -166,13 +166,13 @@ Feature: Project Issues Scenario: I can't preview without text Given I click link "New Issue" And I haven't written any description text - Then I should not see the Markdown preview button + Then The Markdown preview tab should say there is nothing to do @javascript Scenario: I can preview with text Given I click link "New Issue" - And I write a description like "Nice" - Then I should see the Markdown preview button + And I write a description like ":+1: Nice" + Then The Markdown preview tab should display rendered Markdown @javascript Scenario: I preview an issue description @@ -185,4 +185,4 @@ Feature: Project Issues Scenario: I can edit after preview Given I click link "New Issue" And I preview a description text like "Bug fixed :smile:" - Then I should see the Markdown edit button + Then I should see the Markdown write tab -- cgit v1.2.1 From de53bc9d8470d94ec1b956cc2ea1df077c4d034d Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Thu, 16 Oct 2014 23:38:08 -0500 Subject: Add new Markdown preview test Add a test to make sure that Markdown previews are available when editing an existing issue. --- features/project/issues/issues.feature | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'features/project') diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 9970be0c596..28ea44530fe 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -186,3 +186,10 @@ Feature: Project Issues Given I click link "New Issue" And I preview a description text like "Bug fixed :smile:" Then I should see the Markdown write tab + + @javascript + Scenario: I can preview when editing an existing issue + Given I click link "Release 0.4" + And I click link "Edit" for the issue + And I preview a description text like "Bug fixed :smile:" + Then I should see the Markdown write tab -- cgit v1.2.1 From 5bb8aff5ddcc1debb4406303477c1ddbe618d058 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Sat, 18 Oct 2014 18:43:45 -0500 Subject: Fix more Markdown preview tests --- features/project/merge_requests.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'features/project') diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index f8a43e1ee36..7c029f05d75 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -195,14 +195,14 @@ Feature: Project Merge Requests Given I visit merge request page "Bug NS-04" And I click link "Edit" for the merge request And I haven't written any description text - Then I should not see the Markdown preview button + Then The Markdown preview tab should say there is nothing to do @javascript Scenario: I can preview with text Given I visit merge request page "Bug NS-04" And I click link "Edit" for the merge request - And I write a description like "Nice" - Then I should see the Markdown preview button + And I write a description like ":+1: Nice" + Then The Markdown preview tab should display rendered Markdown @javascript Scenario: I preview a merge request description @@ -217,4 +217,4 @@ Feature: Project Merge Requests Given I visit merge request page "Bug NS-04" And I click link "Edit" for the merge request And I preview a description text like "Bug fixed :smile:" - Then I should see the Markdown edit button + Then I should see the Markdown write tab -- cgit v1.2.1 From 2388fdd7c6274dad8c10f5bc517f0a8b1aa28aa3 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Nov 2014 16:06:39 +0200 Subject: Improve fork to namespaces feature * Show namespace thumbnail differently if project was already forked * Show loading spinner when click on fork * Fork link navigates to personal namespace only if no manageable groups exists Signed-off-by: Dmitriy Zaporozhets --- features/project/fork.feature | 2 ++ 1 file changed, 2 insertions(+) (limited to 'features/project') diff --git a/features/project/fork.feature b/features/project/fork.feature index d3d1180db04..22f68e5b340 100644 --- a/features/project/fork.feature +++ b/features/project/fork.feature @@ -6,9 +6,11 @@ Feature: Project Fork Scenario: User fork a project Given I click link "Fork" + When I fork to my namespace Then I should see the forked project page Scenario: User already has forked the project Given I already have a project named "Shop" in my namespace And I click link "Fork" + When I fork to my namespace Then I should see a "Name has already been taken" warning -- cgit v1.2.1 From 533f4cdf30b38c587f7a91f0dfd898b907ecd944 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Wed, 22 Oct 2014 10:54:59 +0200 Subject: gitlab shell works if multiple rubies installed Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed. To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented. For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb. --- features/project/forked_merge_requests.feature | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'features/project') diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature index d9fbb875c28..7442145d87e 100644 --- a/features/project/forked_merge_requests.feature +++ b/features/project/forked_merge_requests.feature @@ -11,20 +11,18 @@ Feature: Project Forked Merge Requests And I submit the merge request Then I should see merge request "Merge Request On Forked Project" - # TODO: Improve it so it does not fail randomly - # - #@javascript - #Scenario: I can edit a forked merge request - #Given I visit project "Forked Shop" merge requests page - #And I click link "New Merge Request" - #And I fill out a "Merge Request On Forked Project" merge request - #And I submit the merge request - #And I should see merge request "Merge Request On Forked Project" - #And I click link edit "Merge Request On Forked Project" - #Then I see the edit page prefilled for "Merge Request On Forked Project" - #And I update the merge request title - #And I save the merge request - #Then I should see the edited merge request + @javascript + Scenario: I can edit a forked merge request + Given I visit project "Forked Shop" merge requests page + And I click link "New Merge Request" + And I fill out a "Merge Request On Forked Project" merge request + And I submit the merge request + And I should see merge request "Merge Request On Forked Project" + And I click link edit "Merge Request On Forked Project" + Then I see the edit page prefilled for "Merge Request On Forked Project" + And I update the merge request title + And I save the merge request + Then I should see the edited merge request @javascript Scenario: I cannot submit an invalid merge request -- cgit v1.2.1 From f7bf892cca6bb8106194c14bef1ed9ddfc26ec91 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Nov 2014 17:14:36 +0200 Subject: Revert "gitlab shell works if multiple rubies installed" This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944. --- features/project/forked_merge_requests.feature | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'features/project') diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature index 7442145d87e..d9fbb875c28 100644 --- a/features/project/forked_merge_requests.feature +++ b/features/project/forked_merge_requests.feature @@ -11,18 +11,20 @@ Feature: Project Forked Merge Requests And I submit the merge request Then I should see merge request "Merge Request On Forked Project" - @javascript - Scenario: I can edit a forked merge request - Given I visit project "Forked Shop" merge requests page - And I click link "New Merge Request" - And I fill out a "Merge Request On Forked Project" merge request - And I submit the merge request - And I should see merge request "Merge Request On Forked Project" - And I click link edit "Merge Request On Forked Project" - Then I see the edit page prefilled for "Merge Request On Forked Project" - And I update the merge request title - And I save the merge request - Then I should see the edited merge request + # TODO: Improve it so it does not fail randomly + # + #@javascript + #Scenario: I can edit a forked merge request + #Given I visit project "Forked Shop" merge requests page + #And I click link "New Merge Request" + #And I fill out a "Merge Request On Forked Project" merge request + #And I submit the merge request + #And I should see merge request "Merge Request On Forked Project" + #And I click link edit "Merge Request On Forked Project" + #Then I see the edit page prefilled for "Merge Request On Forked Project" + #And I update the merge request title + #And I save the merge request + #Then I should see the edited merge request @javascript Scenario: I cannot submit an invalid merge request -- cgit v1.2.1 From 1353f9aa643f86a3f38f3d2dfa8666d3d942293e Mon Sep 17 00:00:00 2001 From: Daniel Aquino Date: Sat, 8 Nov 2014 23:04:31 -0600 Subject: HipChat service: support custom servers HipChat allows users to run their own private servers and to be able to support those we must connect to the correct URL when using one of these custom servers. --- features/project/service.feature | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'features/project') diff --git a/features/project/service.feature b/features/project/service.feature index 88fd038d45f..ed9e03b428d 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -19,6 +19,12 @@ Feature: Project Services And I fill hipchat settings Then I should see hipchat service settings saved + Scenario: Activate hipchat service with custom server + When I visit project "Shop" services page + And I click hipchat service link + And I fill hipchat settings with custom server + Then I should see hipchat service settings with custom server saved + Scenario: Activate pivotaltracker service When I visit project "Shop" services page And I click pivotaltracker service link -- cgit v1.2.1 From 4cbe72d76722ce6c3d327ec62f54478a6e955d32 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 2 Dec 2014 11:31:57 +0200 Subject: UI improvements mostly for mobile screens Signed-off-by: Dmitriy Zaporozhets --- features/project/active_tab.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'features/project') diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature index 8d3e0bd967f..ed548177837 100644 --- a/features/project/active_tab.feature +++ b/features/project/active_tab.feature @@ -110,7 +110,7 @@ Feature: Project Active Tab Scenario: On Project Issues/Browse Given I visit my project's issues page - Then the active sub tab should be Browse Issues + Then the active sub tab should be Issues And no other sub tabs should be active And the active main tab should be Issues -- cgit v1.2.1 From 1fa19401e969f79cbd737c55e63249ca9355791c Mon Sep 17 00:00:00 2001 From: Jason Lippert Date: Mon, 8 Dec 2014 16:54:09 -0500 Subject: Teamcity interaction using 8.1 rest api --- features/project/service.feature | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'features/project') diff --git a/features/project/service.feature b/features/project/service.feature index ed9e03b428d..85939a5c9ca 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -66,3 +66,10 @@ Feature: Project Services And I click Atlassian Bamboo CI service link And I fill Atlassian Bamboo CI settings Then I should see Atlassian Bamboo CI service settings saved + + Scenario: Activate jetBrains TeamCity CI service + When I visit project "Shop" services page + And I click jetBrains TeamCity CI service link + And I fill jetBrains TeamCity CI settings + Then I should see jetBrains TeamCity CI service settings saved + -- cgit v1.2.1 From 18fa1550251655ce84a0886caaab7262fbeb9c51 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sun, 28 Sep 2014 11:52:14 +0200 Subject: Add tests for disabled blob edit button cases. --- features/project/source/browse_files.feature | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'features/project') diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index b7d70881d56..6ea64f70092 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -50,6 +50,16 @@ Feature: Project Source Browse Files And I click button "Edit" Then I can edit code + Scenario: If the file is binary the edit link is hidden + Given I visit a binary file in the repo + Then I cannot see the edit button + + Scenario: If I don't have edit permission the edit link is disabled + Given public project "Community" + And I visit project "Community" source page + And I click on ".gitignore" file in repo + Then The edit button is disabled + @javascript Scenario: I can edit and commit file Given I click on ".gitignore" file in repo -- cgit v1.2.1 From 67b06e7a9b54e39b2f104079dfb293645d8352c7 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Mon, 29 Sep 2014 23:58:01 +0200 Subject: Change always passing visible true tests to false. --- features/project/commits/comments.feature | 5 ----- features/project/commits/diff_comments.feature | 6 ------ 2 files changed, 11 deletions(-) (limited to 'features/project') diff --git a/features/project/commits/comments.feature b/features/project/commits/comments.feature index a45245917e3..afcf0fdbb07 100644 --- a/features/project/commits/comments.feature +++ b/features/project/commits/comments.feature @@ -13,11 +13,6 @@ Feature: Project Commits Comments Scenario: I can't cancel the main form Then I should not see the cancel comment button - @javascript - Scenario: I can't preview without text - Given I haven't written any comment text - Then The comment preview tab should say there is nothing to do - @javascript Scenario: I can preview with text Given I write a comment like ":+1: Nice" diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature index 9c4cc723d1b..56b9a13678d 100644 --- a/features/project/commits/diff_comments.feature +++ b/features/project/commits/diff_comments.feature @@ -54,12 +54,6 @@ Feature: Project Commits Diff Comments Given I leave a diff comment like "Typo, please fix" Then I should see a discussion reply button - @javascript - Scenario: I can't preview without text - Given I open a diff comment form - And I haven't written any diff comment text - Then The diff comment preview tab should say there is nothing to do - @javascript Scenario: I can preview with text Given I open a diff comment form -- cgit v1.2.1 From 42bac7f9f27b0e8fb113e452fc2106882262172d Mon Sep 17 00:00:00 2001 From: Steven Thonus Date: Sat, 25 Jan 2014 18:15:44 +0100 Subject: adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix --- features/project/project.feature | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'features/project') diff --git a/features/project/project.feature b/features/project/project.feature index 7bb24e013a9..3e1fd54bee8 100644 --- a/features/project/project.feature +++ b/features/project/project.feature @@ -5,6 +5,19 @@ Feature: Project And project "Shop" has push event And I visit project "Shop" page + Scenario: I edit the project avatar + Given I visit edit project "Shop" page + When I change the project avatar + And I should see new project avatar + And I should see the "Remove avatar" button + + Scenario: I remove the project avatar + Given I visit edit project "Shop" page + And I have an project avatar + When I remove my project avatar + Then I should see the default project avatar + And I should not see the "Remove avatar" button + @javascript Scenario: I should see project activity When I visit project "Shop" page -- cgit v1.2.1 From 9b5b334a798233b200318ecfbff55f0284f874da Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 26 Jan 2015 16:04:08 -0800 Subject: Remove unused feature steps. --- features/project/edit_issuetracker.feature | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 features/project/edit_issuetracker.feature (limited to 'features/project') diff --git a/features/project/edit_issuetracker.feature b/features/project/edit_issuetracker.feature deleted file mode 100644 index cc0de07ca69..00000000000 --- a/features/project/edit_issuetracker.feature +++ /dev/null @@ -1,18 +0,0 @@ -Feature: Project Issue Tracker - Background: - Given I sign in as a user - And I own project "Shop" - And project "Shop" has issues enabled - And I visit project "Shop" page - - Scenario: I set the issue tracker to "GitLab" - When I visit edit project "Shop" page - And change the issue tracker to "GitLab" - And I save project - Then I the project should have "GitLab" as issue tracker - - Scenario: I set the issue tracker to "Redmine" - When I visit edit project "Shop" page - And change the issue tracker to "Redmine" - And I save project - Then I the project should have "Redmine" as issue tracker -- cgit v1.2.1 From e956066d4a9c3f556a52f80acfb5c761aede7c6c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 27 Jan 2015 12:19:32 -0800 Subject: Add tests for initializing bare repo and creating new file in it --- features/project/source/browse_files.feature | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'features/project') diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index 6ea64f70092..ccb29293a89 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -34,6 +34,19 @@ Feature: Project Source Browse Files Then I am redirected to the new file And I should see its new content + @javascript + Scenario: I can create file in empty repo + Given I own an empty project + And I visit my empty project page + And I create bare repo + When I click on "add a file" link + And I edit code + And I fill the new file name + And I fill the commit message + And I click on "Commit Changes" + Then I am redirected to the new file + And I should see its new content + @javascript Scenario: If I enter an illegal file name I see an error message Given I click on "new file" link in repo -- cgit v1.2.1 From 23c31a0b12eaae7f7f25f30eca1066968bcb6059 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 29 Jan 2015 23:06:43 -0800 Subject: Skip tricky test for semaphore --- features/project/source/browse_files.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'features/project') diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index ccb29293a89..ec2aff4377d 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -24,7 +24,7 @@ Feature: Project Source Browse Files Given I click on "new file" link in repo Then I can see new file page - @javascript + @javascript @tricky Scenario: I can create and commit file Given I click on "new file" link in repo And I edit code -- cgit v1.2.1 From d5d1802096ab8751dfa1e4cf535e9bee79457328 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 29 Jan 2015 23:48:00 -0800 Subject: Set right test as tricky --- features/project/source/browse_files.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'features/project') diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index ec2aff4377d..ee8d0bffa9b 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -24,7 +24,7 @@ Feature: Project Source Browse Files Given I click on "new file" link in repo Then I can see new file page - @javascript @tricky + @javascript Scenario: I can create and commit file Given I click on "new file" link in repo And I edit code @@ -34,7 +34,7 @@ Feature: Project Source Browse Files Then I am redirected to the new file And I should see its new content - @javascript + @javascript @tricky Scenario: I can create file in empty repo Given I own an empty project And I visit my empty project page -- cgit v1.2.1 From b4d9ceb26fc4bd9125cdbd6796a618415d8f6af7 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 29 Jul 2014 17:41:55 +0200 Subject: Add Asana service Also add ability to render "service.help" in markdown --- features/project/service.feature | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'features/project') diff --git a/features/project/service.feature b/features/project/service.feature index 85939a5c9ca..d0600aca010 100644 --- a/features/project/service.feature +++ b/features/project/service.feature @@ -72,4 +72,9 @@ Feature: Project Services And I click jetBrains TeamCity CI service link And I fill jetBrains TeamCity CI settings Then I should see jetBrains TeamCity CI service settings saved - + + Scenario: Activate Asana service + When I visit project "Shop" services page + And I click Asana service link + And I fill Asana settings + Then I should see Asana service settings saved -- cgit v1.2.1 From 6a6a33452288542aa93354f6ce5a7720721e0688 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 19 Feb 2015 17:24:34 -0800 Subject: Fix active tab tests --- features/project/active_tab.feature | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'features/project') diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature index ed548177837..05faad4e645 100644 --- a/features/project/active_tab.feature +++ b/features/project/active_tab.feature @@ -106,24 +106,19 @@ Feature: Project Active Tab And no other sub tabs should be active And the active main tab should be Commits - # Sub Tabs: Issues - Scenario: On Project Issues/Browse Given I visit my project's issues page - Then the active sub tab should be Issues - And no other sub tabs should be active - And the active main tab should be Issues + Then the active main tab should be Issues + And no other main tabs should be active Scenario: On Project Issues/Milestones Given I visit my project's issues page And I click the "Milestones" tab - Then the active sub tab should be Milestones - And no other sub tabs should be active - And the active main tab should be Issues + Then the active main tab should be Milestones + And no other main tabs should be active Scenario: On Project Issues/Labels Given I visit my project's issues page And I click the "Labels" tab - Then the active sub tab should be Labels - And no other sub tabs should be active - And the active main tab should be Issues + Then the active main tab should be Labels + And no other main tabs should be active -- cgit v1.2.1 From 3177693c6f47fda14f84abf0b8f694aec3e076fc Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Mon, 23 Feb 2015 21:00:30 +0200 Subject: WebEditor: save to new branch: spinach --- features/project/source/browse_files.feature | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'features/project') diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index ee8d0bffa9b..90b966dd645 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -34,6 +34,17 @@ Feature: Project Source Browse Files Then I am redirected to the new file And I should see its new content + @javascript + Scenario: I can create and commit file and specify new branch + Given I click on "new file" link in repo + And I edit code + And I fill the new file name + And I fill the commit message + And I fill the new branch name + And I click on "Commit Changes" + Then I am redirected to the new file on new branch + And I should see its new content + @javascript @tricky Scenario: I can create file in empty repo Given I own an empty project @@ -83,6 +94,17 @@ Feature: Project Source Browse Files Then I am redirected to the ".gitignore" And I should see its new content + @javascript + Scenario: I can edit and commit file to new branch + Given I click on ".gitignore" file in repo + And I click button "Edit" + And I edit code + And I fill the commit message + And I fill the new branch name + And I click on "Commit Changes" + Then I am redirected to the ".gitignore" on new branch + And I should see its new content + @javascript @wip Scenario: If I don't change the content of the file I see an error message Given I click on ".gitignore" file in repo -- cgit v1.2.1