Browse Source

Layout/ExtraSpacing

Maarten van den Berg 6 years ago
parent
commit
aaf6a333ff

+ 0 - 15
.rubocop.yml

34
     - 'app/models/participant.rb'
34
     - 'app/models/participant.rb'
35
     - 'app/models/person.rb'
35
     - 'app/models/person.rb'
36
 
36
 
37
-# Offense count: 20
38
-# Cop supports --auto-correct.
39
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
40
-Layout/ExtraSpacing:
41
-  Exclude:
42
-    - 'app/controllers/activities_controller.rb'
43
-    - 'db/schema.rb'
44
-    - 'test/controllers/activities_controller_test.rb'
45
-    - 'test/controllers/api/activities_controller_test.rb'
46
-    - 'test/controllers/api/groups_controller_test.rb'
47
-    - 'test/controllers/api/people_controller_test.rb'
48
-    - 'test/controllers/groups_controller_test.rb'
49
-    - 'test/controllers/members_controller_test.rb'
50
-    - 'test/controllers/people_controller_test.rb'
51
-
52
 # Offense count: 2
37
 # Offense count: 2
53
 # Cop supports --auto-correct.
38
 # Cop supports --auto-correct.
54
 # Configuration parameters: EnforcedStyle, IndentationWidth.
39
 # Configuration parameters: EnforcedStyle, IndentationWidth.

+ 2 - 2
app/controllers/activities_controller.rb

8
     :destroy_subgroup, :immediate_subgroups, :clear_subgroups
8
     :destroy_subgroup, :immediate_subgroups, :clear_subgroups
9
   ]
9
   ]
10
   before_action :set_activity_and_group, only: has_activity_id
10
   before_action :set_activity_and_group, only: has_activity_id
11
-  before_action :set_group,            except: has_activity_id
11
+  before_action :set_group, except: has_activity_id
12
 
12
 
13
   before_action :set_subgroup, only: [:update_subgroup, :destroy_subgroup]
13
   before_action :set_subgroup, only: [:update_subgroup, :destroy_subgroup]
14
   before_action :require_membership!
14
   before_action :require_membership!
156
     @organizers = @activity.organizers
156
     @organizers = @activity.organizers
157
 
157
 
158
     @non_organizers_options = @non_organizers.map{|p| [p.person.full_name, p.id] }
158
     @non_organizers_options = @non_organizers.map{|p| [p.person.full_name, p.id] }
159
-    @organizers_options     =     @organizers.map{|p| [p.person.full_name, p.id] }
159
+    @organizers_options     = @organizers.map{|p| [p.person.full_name, p.id] }
160
 
160
 
161
     @non_organizers_options.sort!
161
     @non_organizers_options.sort!
162
     @organizers_options.sort!
162
     @organizers_options.sort!

+ 2 - 2
test/controllers/activities_controller_test.rb

17
 
17
 
18
   test "should create activity" do
18
   test "should create activity" do
19
     assert_difference('Activity.count') do
19
     assert_difference('Activity.count') do
20
-      post activities_url, params: { activity: {  } }
20
+      post activities_url, params: { activity: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to activity_url(Activity.last)
23
     assert_redirected_to activity_url(Activity.last)
34
   end
34
   end
35
 
35
 
36
   test "should update activity" do
36
   test "should update activity" do
37
-    patch activity_url(@activity), params: { activity: {  } }
37
+    patch activity_url(@activity), params: { activity: { } }
38
     assert_redirected_to activity_url(@activity)
38
     assert_redirected_to activity_url(@activity)
39
   end
39
   end
40
 
40
 

+ 2 - 2
test/controllers/api/activities_controller_test.rb

17
 
17
 
18
   test "should create api_activity" do
18
   test "should create api_activity" do
19
     assert_difference('Api::Activity.count') do
19
     assert_difference('Api::Activity.count') do
20
-      post api_activities_url, params: { api_activity: {  } }
20
+      post api_activities_url, params: { api_activity: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to api_activity_url(Api::Activity.last)
23
     assert_redirected_to api_activity_url(Api::Activity.last)
34
   end
34
   end
35
 
35
 
36
   test "should update api_activity" do
36
   test "should update api_activity" do
37
-    patch api_activity_url(@api_activity), params: { api_activity: {  } }
37
+    patch api_activity_url(@api_activity), params: { api_activity: { } }
38
     assert_redirected_to api_activity_url(@api_activity)
38
     assert_redirected_to api_activity_url(@api_activity)
39
   end
39
   end
40
 
40
 

+ 2 - 2
test/controllers/api/groups_controller_test.rb

17
 
17
 
18
   test "should create api_group" do
18
   test "should create api_group" do
19
     assert_difference('Api::Group.count') do
19
     assert_difference('Api::Group.count') do
20
-      post api_groups_url, params: { api_group: {  } }
20
+      post api_groups_url, params: { api_group: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to api_group_url(Api::Group.last)
23
     assert_redirected_to api_group_url(Api::Group.last)
34
   end
34
   end
35
 
35
 
36
   test "should update api_group" do
36
   test "should update api_group" do
37
-    patch api_group_url(@api_group), params: { api_group: {  } }
37
+    patch api_group_url(@api_group), params: { api_group: { } }
38
     assert_redirected_to api_group_url(@api_group)
38
     assert_redirected_to api_group_url(@api_group)
39
   end
39
   end
40
 
40
 

+ 2 - 2
test/controllers/api/people_controller_test.rb

17
 
17
 
18
   test "should create api_person" do
18
   test "should create api_person" do
19
     assert_difference('Api::Person.count') do
19
     assert_difference('Api::Person.count') do
20
-      post api_people_url, params: { api_person: {  } }
20
+      post api_people_url, params: { api_person: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to api_person_url(Api::Person.last)
23
     assert_redirected_to api_person_url(Api::Person.last)
34
   end
34
   end
35
 
35
 
36
   test "should update api_person" do
36
   test "should update api_person" do
37
-    patch api_person_url(@api_person), params: { api_person: {  } }
37
+    patch api_person_url(@api_person), params: { api_person: { } }
38
     assert_redirected_to api_person_url(@api_person)
38
     assert_redirected_to api_person_url(@api_person)
39
   end
39
   end
40
 
40
 

+ 2 - 2
test/controllers/groups_controller_test.rb

17
 
17
 
18
   test "should create group" do
18
   test "should create group" do
19
     assert_difference('Group.count') do
19
     assert_difference('Group.count') do
20
-      post groups_url, params: { group: {  } }
20
+      post groups_url, params: { group: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to group_url(Group.last)
23
     assert_redirected_to group_url(Group.last)
34
   end
34
   end
35
 
35
 
36
   test "should update group" do
36
   test "should update group" do
37
-    patch group_url(@group), params: { group: {  } }
37
+    patch group_url(@group), params: { group: { } }
38
     assert_redirected_to group_url(@group)
38
     assert_redirected_to group_url(@group)
39
   end
39
   end
40
 
40
 

+ 2 - 2
test/controllers/members_controller_test.rb

17
 
17
 
18
   test "should create member" do
18
   test "should create member" do
19
     assert_difference('Member.count') do
19
     assert_difference('Member.count') do
20
-      post members_url, params: { member: {  } }
20
+      post members_url, params: { member: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to member_url(Member.last)
23
     assert_redirected_to member_url(Member.last)
34
   end
34
   end
35
 
35
 
36
   test "should update member" do
36
   test "should update member" do
37
-    patch member_url(@member), params: { member: {  } }
37
+    patch member_url(@member), params: { member: { } }
38
     assert_redirected_to member_url(@member)
38
     assert_redirected_to member_url(@member)
39
   end
39
   end
40
 
40
 

+ 2 - 2
test/controllers/people_controller_test.rb

17
 
17
 
18
   test "should create person" do
18
   test "should create person" do
19
     assert_difference('Person.count') do
19
     assert_difference('Person.count') do
20
-      post people_url, params: { person: {  } }
20
+      post people_url, params: { person: { } }
21
     end
21
     end
22
 
22
 
23
     assert_redirected_to person_url(Person.last)
23
     assert_redirected_to person_url(Person.last)
34
   end
34
   end
35
 
35
 
36
   test "should update person" do
36
   test "should update person" do
37
-    patch person_url(@person), params: { person: {  } }
37
+    patch person_url(@person), params: { person: { } }
38
     assert_redirected_to person_url(@person)
38
     assert_redirected_to person_url(@person)
39
   end
39
   end
40
 
40