diff options
Diffstat (limited to 'features')
55 files changed, 78 insertions, 70 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index a674800ccb8..e4f10c0de2e 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -13,7 +13,7 @@ Feature: Project Browse files Scenario: I browse file content Given I click on ".gitignore" file in repo - Then I should see it content + Then I should see its content Scenario: I browse raw file Given I visit blob file from repo diff --git a/features/steps/admin/active_tab.rb b/features/steps/admin/active_tab.rb index 58853361afc..90d13abdb13 100644 --- a/features/steps/admin/active_tab.rb +++ b/features/steps/admin/active_tab.rb @@ -1,4 +1,4 @@ -class AdminActiveTab < Spinach::FeatureSteps +class Spinach::Features::AdminActiveTab < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedActiveTab diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb index 4aa8b0f551d..4f0ba05606d 100644 --- a/features/steps/admin/groups.rb +++ b/features/steps/admin/groups.rb @@ -1,4 +1,4 @@ -class AdminGroups < Spinach::FeatureSteps +class Spinach::Features::AdminGroups < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedUser @@ -40,7 +40,7 @@ class AdminGroups < Spinach::FeatureSteps user = User.find_by(name: "John Doe") select2(user.id, from: "#user_ids", multiple: true) within "#new_team_member" do - select "Reporter", from: "group_access" + select "Reporter", from: "access_level" end click_button "Add users into group" end diff --git a/features/steps/admin/logs.rb b/features/steps/admin/logs.rb index 697c96585bf..904e5468655 100644 --- a/features/steps/admin/logs.rb +++ b/features/steps/admin/logs.rb @@ -1,4 +1,4 @@ -class AdminLogs < Spinach::FeatureSteps +class Spinach::Features::AdminLogs < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedAdmin diff --git a/features/steps/admin/projects.rb b/features/steps/admin/projects.rb index e0015bfd37c..2fd6385fe7b 100644 --- a/features/steps/admin/projects.rb +++ b/features/steps/admin/projects.rb @@ -1,4 +1,4 @@ -class AdminProjects < Spinach::FeatureSteps +class Spinach::Features::AdminProjects < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedAdmin diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb index 6e9b9fce0ee..3422dc2b5af 100644 --- a/features/steps/admin/users.rb +++ b/features/steps/admin/users.rb @@ -1,4 +1,4 @@ -class AdminUsers < Spinach::FeatureSteps +class Spinach::Features::AdminUsers < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedAdmin diff --git a/features/steps/dashboard/active_tab.rb b/features/steps/dashboard/active_tab.rb index d5db3339df2..0e2c04fb299 100644 --- a/features/steps/dashboard/active_tab.rb +++ b/features/steps/dashboard/active_tab.rb @@ -1,4 +1,4 @@ -class DashboardActiveTab < Spinach::FeatureSteps +class Spinach::Features::DashboardActiveTab < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedActiveTab diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb index 92dd2841004..eb735d9b567 100644 --- a/features/steps/dashboard/dashboard.rb +++ b/features/steps/dashboard/dashboard.rb @@ -1,4 +1,4 @@ -class Dashboard < Spinach::FeatureSteps +class Spinach::Features::Dashboard < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb index 51162dbacc4..332bfa95d97 100644 --- a/features/steps/dashboard/event_filters.rb +++ b/features/steps/dashboard/event_filters.rb @@ -1,4 +1,4 @@ -class EventFilters < Spinach::FeatureSteps +class Spinach::Features::EventFilters < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject @@ -82,6 +82,4 @@ class EventFilters < Spinach::FeatureSteps When 'I click "merge" event filter' do click_link("merged_event_filter") end - end - diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb index 1344edfa80b..6b5f88e5895 100644 --- a/features/steps/dashboard/issues.rb +++ b/features/steps/dashboard/issues.rb @@ -1,4 +1,4 @@ -class DashboardIssues < Spinach::FeatureSteps +class Spinach::Features::DashboardIssues < Spinach::FeatureSteps include SharedAuthentication include SharedPaths diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb index e198bc0cf9c..95c378fa201 100644 --- a/features/steps/dashboard/merge_requests.rb +++ b/features/steps/dashboard/merge_requests.rb @@ -1,4 +1,4 @@ -class DashboardMergeRequests < Spinach::FeatureSteps +class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps include SharedAuthentication include SharedPaths diff --git a/features/steps/dashboard/projects.rb b/features/steps/dashboard/projects.rb index 2b41aa6374e..2a348163060 100644 --- a/features/steps/dashboard/projects.rb +++ b/features/steps/dashboard/projects.rb @@ -1,4 +1,4 @@ -class DashboardProjects < Spinach::FeatureSteps +class Spinach::Features::DashboardProjects < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/dashboard/shortcuts.rb b/features/steps/dashboard/shortcuts.rb index d4484e7a20f..a9083850b52 100644 --- a/features/steps/dashboard/shortcuts.rb +++ b/features/steps/dashboard/shortcuts.rb @@ -1,4 +1,4 @@ -class DashboardShortcuts < Spinach::FeatureSteps +class Spinach::Features::DashboardShortcuts < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/dashboard/with_archived_projects.rb b/features/steps/dashboard/with_archived_projects.rb index 3d942107428..256629382a7 100644 --- a/features/steps/dashboard/with_archived_projects.rb +++ b/features/steps/dashboard/with_archived_projects.rb @@ -1,4 +1,4 @@ -class DashboardWithArchivedProjects < Spinach::FeatureSteps +class Spinach::Features::DashboardWithArchivedProjects < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 52c722e2039..da0cf7bbd45 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -1,4 +1,4 @@ -class Groups < Spinach::FeatureSteps +class Spinach::Features::Groups < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedGroup @@ -32,7 +32,7 @@ class Groups < Spinach::FeatureSteps click_link 'Add members' within ".users-group-form" do select2(user.id, from: "#user_ids", multiple: true) - select "Reporter", from: "group_access" + select "Reporter", from: "access_level" end click_button "Add users into group" end diff --git a/features/steps/profile/active_tab.rb b/features/steps/profile/active_tab.rb index f903d73c2ec..8595ee876a4 100644 --- a/features/steps/profile/active_tab.rb +++ b/features/steps/profile/active_tab.rb @@ -1,4 +1,4 @@ -class ProfileActiveTab < Spinach::FeatureSteps +class Spinach::Features::ProfileActiveTab < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedActiveTab diff --git a/features/steps/profile/emails.rb b/features/steps/profile/emails.rb index d4fb1ecc79c..2b6ac37d866 100644 --- a/features/steps/profile/emails.rb +++ b/features/steps/profile/emails.rb @@ -1,4 +1,4 @@ -class ProfileEmails < Spinach::FeatureSteps +class Spinach::Features::ProfileEmails < Spinach::FeatureSteps include SharedAuthentication step 'I visit profile emails page' do diff --git a/features/steps/profile/group.rb b/features/steps/profile/group.rb index 03144104c7e..81d5bc15e21 100644 --- a/features/steps/profile/group.rb +++ b/features/steps/profile/group.rb @@ -1,4 +1,4 @@ -class ProfileGroup < Spinach::FeatureSteps +class Spinach::Features::ProfileGroup < Spinach::FeatureSteps include SharedAuthentication include SharedGroup include SharedPaths diff --git a/features/steps/profile/notifications.rb b/features/steps/profile/notifications.rb index e884df3098e..df96dddd06e 100644 --- a/features/steps/profile/notifications.rb +++ b/features/steps/profile/notifications.rb @@ -1,4 +1,4 @@ -class ProfileNotifications < Spinach::FeatureSteps +class Spinach::Features::ProfileNotifications < Spinach::FeatureSteps include SharedAuthentication include SharedProject diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index 5a7ac207314..adfaefb1644 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -1,4 +1,4 @@ -class Profile < Spinach::FeatureSteps +class Spinach::Features::Profile < Spinach::FeatureSteps include SharedAuthentication include SharedPaths diff --git a/features/steps/profile/ssh_keys.rb b/features/steps/profile/ssh_keys.rb index 8522d131b1e..d1e87d40705 100644 --- a/features/steps/profile/ssh_keys.rb +++ b/features/steps/profile/ssh_keys.rb @@ -1,4 +1,4 @@ -class ProfileSshKeys < Spinach::FeatureSteps +class Spinach::Features::ProfileSshKeys < Spinach::FeatureSteps include SharedAuthentication step 'I should see my ssh keys' do diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb index 3db80a4c6b4..83796b0ba88 100644 --- a/features/steps/project/active_tab.rb +++ b/features/steps/project/active_tab.rb @@ -1,4 +1,4 @@ -class ProjectActiveTab < Spinach::FeatureSteps +class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/project/archived.rb b/features/steps/project/archived.rb index abb4806e5f1..afbf4d5950d 100644 --- a/features/steps/project/archived.rb +++ b/features/steps/project/archived.rb @@ -1,4 +1,4 @@ -class ProjectArchived < Spinach::FeatureSteps +class Spinach::Features::ProjectArchived < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/browse_branches.rb b/features/steps/project/browse_branches.rb index cfc88bdad22..e2b5ca59617 100644 --- a/features/steps/project/browse_branches.rb +++ b/features/steps/project/browse_branches.rb @@ -1,4 +1,4 @@ -class ProjectBrowseBranches < Spinach::FeatureSteps +class Spinach::Features::ProjectBrowseBranches < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/browse_commits.rb b/features/steps/project/browse_commits.rb index df961ea4687..9f1f7c96972 100644 --- a/features/steps/project/browse_commits.rb +++ b/features/steps/project/browse_commits.rb @@ -1,4 +1,4 @@ -class ProjectBrowseCommits < Spinach::FeatureSteps +class Spinach::Features::ProjectBrowseCommits < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/browse_commits_user_lookup.rb b/features/steps/project/browse_commits_user_lookup.rb index 2680a32a1d8..196c69eda65 100644 --- a/features/steps/project/browse_commits_user_lookup.rb +++ b/features/steps/project/browse_commits_user_lookup.rb @@ -1,4 +1,4 @@ -class ProjectBrowseCommitsUserLookup < Spinach::FeatureSteps +class Spinach::Features::ProjectBrowseCommitsUserLookup < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/browse_files.rb b/features/steps/project/browse_files.rb index bd395a0d26e..ca96ed0b6fa 100644 --- a/features/steps/project/browse_files.rb +++ b/features/steps/project/browse_files.rb @@ -1,4 +1,4 @@ -class ProjectBrowseFiles < Spinach::FeatureSteps +class Spinach::Features::ProjectBrowseFiles < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths @@ -20,7 +20,7 @@ class ProjectBrowseFiles < Spinach::FeatureSteps click_link ".gitignore" end - step 'I should see it content' do + step 'I should see its content' do page.should have_content "*.rbc" end @@ -77,7 +77,9 @@ class ProjectBrowseFiles < Spinach::FeatureSteps end step 'I click on readme file' do - click_link 'README.md' + within '.tree-table' do + click_link 'README.md' + end end step 'I see Browse file link' do diff --git a/features/steps/project/browse_git_repo.rb b/features/steps/project/browse_git_repo.rb index fb6fce4867a..09f44eb4c6d 100644 --- a/features/steps/project/browse_git_repo.rb +++ b/features/steps/project/browse_git_repo.rb @@ -1,4 +1,4 @@ -class ProjectBrowseGitRepo < Spinach::FeatureSteps +class Spinach::Features::ProjectBrowseGitRepo < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/browse_tags.rb b/features/steps/project/browse_tags.rb index 6ccf5a87927..85cdc71ef75 100644 --- a/features/steps/project/browse_tags.rb +++ b/features/steps/project/browse_tags.rb @@ -1,4 +1,4 @@ -class ProjectBrowseTags < Spinach::FeatureSteps +class Spinach::Features::ProjectBrowseTags < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/comments_on_commit_diffs.rb b/features/steps/project/comments_on_commit_diffs.rb index fc397a4fa91..50b978a5d23 100644 --- a/features/steps/project/comments_on_commit_diffs.rb +++ b/features/steps/project/comments_on_commit_diffs.rb @@ -1,4 +1,4 @@ -class CommentsOnCommitDiffs < Spinach::FeatureSteps +class Spinach::Features::CommentsOnCommitDiffs < Spinach::FeatureSteps include SharedAuthentication include SharedDiffNote include SharedPaths diff --git a/features/steps/project/comments_on_commits.rb b/features/steps/project/comments_on_commits.rb index 56bb12a8209..03e6867c7b1 100644 --- a/features/steps/project/comments_on_commits.rb +++ b/features/steps/project/comments_on_commits.rb @@ -1,4 +1,4 @@ -class CommentsOnCommits < Spinach::FeatureSteps +class Spinach::Features::CommentsOnCommits < Spinach::FeatureSteps include SharedAuthentication include SharedNote include SharedPaths diff --git a/features/steps/project/create.rb b/features/steps/project/create.rb index a2efa17c82d..bcd2524c205 100644 --- a/features/steps/project/create.rb +++ b/features/steps/project/create.rb @@ -1,4 +1,4 @@ -class CreateProject < Spinach::FeatureSteps +class Spinach::Features::CreateProject < Spinach::FeatureSteps include SharedAuthentication include SharedPaths diff --git a/features/steps/project/filter_labels.rb b/features/steps/project/filter_labels.rb index 9b31a6d9da2..aaa0cfe3379 100644 --- a/features/steps/project/filter_labels.rb +++ b/features/steps/project/filter_labels.rb @@ -1,4 +1,4 @@ -class ProjectFilterLabels < Spinach::FeatureSteps +class Spinach::Features::ProjectFilterLabels < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb index 93ceaa0ebb1..791c6b1ffb9 100644 --- a/features/steps/project/fork.rb +++ b/features/steps/project/fork.rb @@ -1,4 +1,4 @@ -class ForkProject < Spinach::FeatureSteps +class Spinach::Features::ForkProject < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb index 6ec527df13d..e8a6d635308 100644 --- a/features/steps/project/forked_merge_requests.rb +++ b/features/steps/project/forked_merge_requests.rb @@ -1,4 +1,4 @@ -class ProjectForkedMergeRequests < Spinach::FeatureSteps +class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedNote diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb index eb7cc42e942..c54321717b3 100644 --- a/features/steps/project/graph.rb +++ b/features/steps/project/graph.rb @@ -1,4 +1,4 @@ -class ProjectGraph < Spinach::FeatureSteps +class Spinach::Features::ProjectGraph < Spinach::FeatureSteps include SharedAuthentication include SharedProject diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb index 2bd383676e7..79a51020568 100644 --- a/features/steps/project/hooks.rb +++ b/features/steps/project/hooks.rb @@ -1,6 +1,6 @@ require 'webmock' -class ProjectHooks < Spinach::FeatureSteps +class Spinach::Features::ProjectHooks < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/issue_tracker.rb b/features/steps/project/issue_tracker.rb index 6bdfda86c10..e1700292701 100644 --- a/features/steps/project/issue_tracker.rb +++ b/features/steps/project/issue_tracker.rb @@ -1,4 +1,4 @@ -class ProjectIssueTracker < Spinach::FeatureSteps +class Spinach::Features::ProjectIssueTracker < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/issues.rb b/features/steps/project/issues.rb index 3b98eb1e926..1aaf8b1cb7e 100644 --- a/features/steps/project/issues.rb +++ b/features/steps/project/issues.rb @@ -1,4 +1,4 @@ -class ProjectIssues < Spinach::FeatureSteps +class Spinach::Features::ProjectIssues < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedNote diff --git a/features/steps/project/labels.rb b/features/steps/project/labels.rb index 62c1d74c718..b287e183b91 100644 --- a/features/steps/project/labels.rb +++ b/features/steps/project/labels.rb @@ -1,4 +1,4 @@ -class ProjectLabels < Spinach::FeatureSteps +class Spinach::Features::ProjectLabels < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/markdown_render.rb b/features/steps/project/markdown_render.rb index f4b71c02b38..a8631af2e05 100644 --- a/features/steps/project/markdown_render.rb +++ b/features/steps/project/markdown_render.rb @@ -79,9 +79,17 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps end step 'I navigate to the doc/api/README' do - click_link "doc" - click_link "api" - click_link "README.md" + within '.tree-table' do + click_link "doc" + end + + within '.tree-table' do + click_link "api" + end + + within '.tree-table' do + click_link "README.md" + end end step 'I see correct file rendered' do diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 3ffa3622f4b..da3e5ec8037 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -1,4 +1,4 @@ -class ProjectMergeRequests < Spinach::FeatureSteps +class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedNote diff --git a/features/steps/project/milestones.rb b/features/steps/project/milestones.rb index 263668738e4..13f917a6279 100644 --- a/features/steps/project/milestones.rb +++ b/features/steps/project/milestones.rb @@ -1,4 +1,4 @@ -class ProjectMilestones < Spinach::FeatureSteps +class Spinach::Features::ProjectMilestones < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/multiselect_blob.rb b/features/steps/project/multiselect_blob.rb index d4dc1186970..c81d2b3b998 100644 --- a/features/steps/project/multiselect_blob.rb +++ b/features/steps/project/multiselect_blob.rb @@ -1,4 +1,4 @@ -class ProjectMultiselectBlob < Spinach::FeatureSteps +class Spinach::Features::ProjectMultiselectBlob < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/network_graph.rb b/features/steps/project/network_graph.rb index d678527ac07..5f7327fc2db 100644 --- a/features/steps/project/network_graph.rb +++ b/features/steps/project/network_graph.rb @@ -1,4 +1,4 @@ -class ProjectNetworkGraph < Spinach::FeatureSteps +class Spinach::Features::ProjectNetworkGraph < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index 2ffa1a62978..3e7061a421f 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -1,4 +1,4 @@ -class ProjectFeature < Spinach::FeatureSteps +class Spinach::Features::ProjectFeature < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/project_shortcuts.rb b/features/steps/project/project_shortcuts.rb index ce6e21a4258..a10e7bf78ee 100644 --- a/features/steps/project/project_shortcuts.rb +++ b/features/steps/project/project_shortcuts.rb @@ -1,4 +1,4 @@ -class ProjectShortcuts < Spinach::FeatureSteps +class Spinach::Features::ProjectShortcuts < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/project/search_code.rb b/features/steps/project/search_code.rb index 55218b6e745..5753296251f 100644 --- a/features/steps/project/search_code.rb +++ b/features/steps/project/search_code.rb @@ -1,4 +1,4 @@ -class ProjectSearchCode < Spinach::FeatureSteps +class Spinach::Features::ProjectSearchCode < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb index 0594a08a5e7..b56b413eac8 100644 --- a/features/steps/project/services.rb +++ b/features/steps/project/services.rb @@ -1,4 +1,4 @@ -class ProjectServices < Spinach::FeatureSteps +class Spinach::Features::ProjectServices < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb index 2df7b007402..2f8d3205d6c 100644 --- a/features/steps/project/snippets.rb +++ b/features/steps/project/snippets.rb @@ -1,4 +1,4 @@ -class ProjectSnippets < Spinach::FeatureSteps +class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedNote diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb index 4653b772a8d..7907f2a6fe3 100644 --- a/features/steps/project/team_management.rb +++ b/features/steps/project/team_management.rb @@ -1,4 +1,4 @@ -class ProjectTeamManagement < Spinach::FeatureSteps +class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths @@ -23,8 +23,8 @@ class ProjectTeamManagement < Spinach::FeatureSteps user = User.find_by(name: "Mike") select2(user.id, from: "#user_ids", multiple: true) - within "#new_team_member" do - select "Reporter", from: "project_access" + within "#new_project_member" do + select "Reporter", from: "access_level" end click_button "Add users" end @@ -44,7 +44,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps step 'I change "Sam" role to "Reporter"' do user = User.find_by(name: "Sam") within "#user_#{user.id}" do - select "Reporter", from: "team_member_project_access" + select "Reporter", from: "project_member_access_level" end end diff --git a/features/steps/snippets/discover.rb b/features/steps/snippets/discover.rb index 307fcc668b2..da73dfc68be 100644 --- a/features/steps/snippets/discover.rb +++ b/features/steps/snippets/discover.rb @@ -1,4 +1,4 @@ -class DiscoverSnippets < Spinach::FeatureSteps +class Spinach::Features::DiscoverSnippets < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedSnippet diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb index 74e9c84dbaf..e8154c8ce57 100644 --- a/features/steps/snippets/snippets.rb +++ b/features/steps/snippets/snippets.rb @@ -1,4 +1,4 @@ -class SnippetsFeature < Spinach::FeatureSteps +class Spinach::Features::SnippetsFeature < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject diff --git a/features/steps/snippets/user.rb b/features/steps/snippets/user.rb index 9b702b8c844..71a1952926f 100644 --- a/features/steps/snippets/user.rb +++ b/features/steps/snippets/user.rb @@ -1,4 +1,4 @@ -class UserSnippets < Spinach::FeatureSteps +class Spinach::Features::UserSnippets < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedSnippet diff --git a/features/support/env.rb b/features/support/env.rb index 22f28987fe3..4b76faab564 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,20 +1,20 @@ -require 'simplecov' unless ENV['CI'] +if ENV['SIMPLECOV'] + require 'simplecov' +end -if ENV['TRAVIS'] +if ENV['COVERALLS'] require 'coveralls' - Coveralls.wear! + Coveralls.wear_merged!('rails') end ENV['RAILS_ENV'] = 'test' require './config/environment' - require 'rspec' require 'rspec/expectations' require 'database_cleaner' require 'spinach/capybara' require 'sidekiq/testing/inline' - %w(select2_helper test_env repo_helpers).each do |f| require Rails.root.join('spec', 'support', f) end |