From f167f37e5a2cd0b053a7647f2035a0296337bec2 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 22 Jun 2015 14:21:34 +0200
Subject: [PATCH] Fix rubocop issues at feature/ directory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
features/steps/dashboard/dashboard.rb | 2 +-
features/steps/dashboard/event_filters.rb | 2 +-
features/steps/explore/projects.rb | 1 -
features/steps/project/snippets.rb | 6 ++--
features/steps/shared/admin.rb | 1 -
features/steps/shared/issuable.rb | 2 +-
features/steps/shared/paths.rb | 40 +++++++++++------------
features/steps/shared/user.rb | 6 ++--
features/steps/snippets/snippets.rb | 12 +++----
9 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index 945bf35ff27..cb3a80cac29 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -28,7 +28,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
end
step 'user with name "John Doe" joined project "Shop"' do
- user = create(:user, {name: "John Doe"})
+ user = create(:user, { name: "John Doe" })
project.team << [user, :master]
Event.create(
project: project,
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb
index 834afa439a0..726b37cfde5 100644
--- a/features/steps/dashboard/event_filters.rb
+++ b/features/steps/dashboard/event_filters.rb
@@ -52,7 +52,7 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
end
step 'this project has new member event' do
- user = create(:user, {name: "John Doe"})
+ user = create(:user, { name: "John Doe" })
Event.create(
project: @project,
author_id: user.id,
diff --git a/features/steps/explore/projects.rb b/features/steps/explore/projects.rb
index 49c2f6a1253..8b498e7b4a6 100644
--- a/features/steps/explore/projects.rb
+++ b/features/steps/explore/projects.rb
@@ -145,4 +145,3 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
@public_merge_request ||= MergeRequest.find_by!(title: 'Bug fix for public project')
end
end
-
diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb
index eedb4e1b74a..db8ad08bb9e 100644
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
@@ -52,8 +52,8 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
end
step 'I submit new snippet "Snippet three"' do
- fill_in "project_snippet_title", :with => "Snippet three"
- fill_in "project_snippet_file_name", :with => "my_snippet.rb"
+ fill_in "project_snippet_title", with: "Snippet three"
+ fill_in "project_snippet_file_name", with: "my_snippet.rb"
page.within('.file-editor') do
find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three'
end
@@ -66,7 +66,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
end
step 'I submit new title "Snippet new title"' do
- fill_in "project_snippet_title", :with => "Snippet new title"
+ fill_in "project_snippet_title", with: "Snippet new title"
click_button "Save"
end
diff --git a/features/steps/shared/admin.rb b/features/steps/shared/admin.rb
index b6072995677..fbaa408226e 100644
--- a/features/steps/shared/admin.rb
+++ b/features/steps/shared/admin.rb
@@ -9,4 +9,3 @@ module SharedAdmin
2.times { create(:user) }
end
end
-
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index 41db2612f26..e6d1b8b8efc 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -2,7 +2,7 @@ module SharedIssuable
include Spinach::DSL
def edit_issuable
- find(:css, '.issuable-edit').click
+ find(:css, '.issuable-edit').click
end
step 'I click link "Edit" for the merge request' do
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 3bd0d60281c..88ab9d0ab43 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -20,43 +20,43 @@ module SharedPaths
# ----------------------------------------
step 'I visit group "Owned" page' do
- visit group_path(Group.find_by(name:"Owned"))
+ visit group_path(Group.find_by(name: "Owned"))
end
step 'I visit group "Owned" issues page' do
- visit issues_group_path(Group.find_by(name:"Owned"))
+ visit issues_group_path(Group.find_by(name: "Owned"))
end
step 'I visit group "Owned" merge requests page' do
- visit merge_requests_group_path(Group.find_by(name:"Owned"))
+ visit merge_requests_group_path(Group.find_by(name: "Owned"))
end
step 'I visit group "Owned" members page' do
- visit group_group_members_path(Group.find_by(name:"Owned"))
+ visit group_group_members_path(Group.find_by(name: "Owned"))
end
step 'I visit group "Owned" settings page' do
- visit edit_group_path(Group.find_by(name:"Owned"))
+ visit edit_group_path(Group.find_by(name: "Owned"))
end
step 'I visit group "Guest" page' do
- visit group_path(Group.find_by(name:"Guest"))
+ visit group_path(Group.find_by(name: "Guest"))
end
step 'I visit group "Guest" issues page' do
- visit issues_group_path(Group.find_by(name:"Guest"))
+ visit issues_group_path(Group.find_by(name: "Guest"))
end
step 'I visit group "Guest" merge requests page' do
- visit merge_requests_group_path(Group.find_by(name:"Guest"))
+ visit merge_requests_group_path(Group.find_by(name: "Guest"))
end
step 'I visit group "Guest" members page' do
- visit group_group_members_path(Group.find_by(name:"Guest"))
+ visit group_group_members_path(Group.find_by(name: "Guest"))
end
step 'I visit group "Guest" settings page' do
- visit edit_group_path(Group.find_by(name:"Guest"))
+ visit edit_group_path(Group.find_by(name: "Guest"))
end
# ----------------------------------------
@@ -201,11 +201,11 @@ module SharedPaths
end
step "I visit my project's commits page" do
- visit namespace_project_commits_path(@project.namespace, @project, root_ref, {limit: 5})
+ visit namespace_project_commits_path(@project.namespace, @project, root_ref, { limit: 5 })
end
step "I visit my project's commits page for a specific path" do
- visit namespace_project_commits_path(@project.namespace, @project, root_ref + "/app/models/project.rb", {limit: 5})
+ visit namespace_project_commits_path(@project.namespace, @project, root_ref + "/app/models/project.rb", { limit: 5 })
end
step 'I visit my project\'s commits stats page' do
@@ -272,11 +272,11 @@ module SharedPaths
end
step 'I visit project commits page' do
- visit namespace_project_commits_path(@project.namespace, @project, root_ref, {limit: 5})
+ visit namespace_project_commits_path(@project.namespace, @project, root_ref, { limit: 5 })
end
step 'I visit project commits page for stable branch' do
- visit namespace_project_commits_path(@project.namespace, @project, 'stable', {limit: 5})
+ visit namespace_project_commits_path(@project.namespace, @project, 'stable', { limit: 5 })
end
step 'I visit project source page' do
@@ -418,13 +418,13 @@ module SharedPaths
visit explore_projects_path
end
- step 'I visit the explore trending projects' do
- visit trending_explore_projects_path
- end
+ step 'I visit the explore trending projects' do
+ visit trending_explore_projects_path
+ end
- step 'I visit the explore starred projects' do
- visit starred_explore_projects_path
- end
+ step 'I visit the explore starred projects' do
+ visit starred_explore_projects_path
+ end
step 'I visit the public groups area' do
visit explore_groups_path
diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb
index 209d77c7acf..fc1e8d6e889 100644
--- a/features/steps/shared/user.rb
+++ b/features/steps/shared/user.rb
@@ -2,16 +2,16 @@ module SharedUser
include Spinach::DSL
step 'User "John Doe" exists' do
- user_exists("John Doe", {username: "john_doe"})
+ user_exists("John Doe", { username: "john_doe" })
end
step 'User "Mary Jane" exists' do
- user_exists("Mary Jane", {username: "mary_jane"})
+ user_exists("Mary Jane", { username: "mary_jane" })
end
protected
def user_exists(name, options = {})
- User.find_by(name: name) || create(:user, {name: name, admin: false}.merge(options))
+ User.find_by(name: name) || create(:user, { name: name, admin: false }.merge(options))
end
end
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index 426da2918ea..6ff48e0c6b8 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -23,8 +23,8 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
end
step 'I submit new snippet "Personal snippet three"' do
- fill_in "personal_snippet_title", :with => "Personal snippet three"
- fill_in "personal_snippet_file_name", :with => "my_snippet.rb"
+ fill_in "personal_snippet_title", with: "Personal snippet three"
+ fill_in "personal_snippet_file_name", with: "my_snippet.rb"
page.within('.file-editor') do
find(:xpath, "//input[@id='personal_snippet_content']").set 'Content of snippet three'
end
@@ -32,12 +32,12 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
end
step 'I submit new internal snippet' do
- fill_in "personal_snippet_title", :with => "Internal personal snippet one"
- fill_in "personal_snippet_file_name", :with => "my_snippet.rb"
+ fill_in "personal_snippet_title", with: "Internal personal snippet one"
+ fill_in "personal_snippet_file_name", with: "my_snippet.rb"
choose 'personal_snippet_visibility_level_10'
page.within('.file-editor') do
- find(:xpath, "//input[@id='personal_snippet_content']").set 'Content of internal snippet'
+ find(:xpath, "//input[@id='personal_snippet_content']").set 'Content of internal snippet'
end
click_button "Create snippet"
@@ -49,7 +49,7 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
end
step 'I submit new title "Personal snippet new title"' do
- fill_in "personal_snippet_title", :with => "Personal snippet new title"
+ fill_in "personal_snippet_title", with: "Personal snippet new title"
click_button "Save"
end
--
GitLab