Mandatory cosmetic changes to satisfy tests26150_generate_valid_atom

2 files changed, 12 insertions, 12 deletions

diff --git a/app/views/issues/_issue.atom.builder b/app/views/issues/_issue.atom.builder
index 0390abdca77..6ffa6ad7253 100644
--- a/app/views/issues/_issue.atom.builder
+++ b/app/views/issues/_issue.atom.builder
@@ -7,7 +7,7 @@ xml.entry do
 
   xml.author do
     xml.name issue.author_name
-    xml.email issue.author_public_email if issue.author_public_email and !issue.author_public_email.empty?
+    xml.email issue.author_public_email if issue.author_public_email && !issue.author_public_email.empty?
   end
 
   xml.summary issue.title
@@ -22,12 +22,12 @@ xml.entry do
     end
   end
 
-# Names each contributor to the entry. An entry may have multiple contributor elements.
+  # Names each contributor to the entry. An entry may have multiple contributor elements.
   if issue.assignees.any?
     issue.assignees.each do |assignee|
       xml.contributor do
         xml.name assignee.name
-        xml.email assignee.public_email if assignee.public_email and !assignee.public_email.empty?
+        xml.email assignee.public_email if assignee.public_email && !assignee.public_email.empty?
       end
     end
   end
diff --git a/spec/features/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb
index 9c257e54be6..38a4a4ac9e6 100644
--- a/spec/features/atom/issues_spec.rb
+++ b/spec/features/atom/issues_spec.rb
@@ -21,9 +21,9 @@ describe 'Issues Feed' do
         expect(response_headers['Content-Type'])
           .to have_content('application/atom+xml')
         expect(body).to have_selector('title', text: "#{project.name} issues")
-        #expect(body).to have_selector('author email', text: issue.author_public_email)
-        #expect(body).to have_selector('assignees assignee email', text: issue.assignees.first.public_email)
-        #expect(body).to have_selector('assignee email', text: issue.assignees.first.public_email)
+        # expect(body).to have_selector('author email', text: issue.author_public_email)
+        # expect(body).to have_selector('assignees assignee email', text: issue.assignees.first.public_email)
+        # expect(body).to have_selector('assignee email', text: issue.assignees.first.public_email)
         expect(body).to have_selector('entry summary', text: issue.title)
       end
     end
@@ -38,9 +38,9 @@ describe 'Issues Feed' do
         expect(response_headers['Content-Type'])
           .to have_content('application/atom+xml')
         expect(body).to have_selector('title', text: "#{project.name} issues")
-        #expect(body).to have_selector('author email', text: issue.author_public_email)
-        #expect(body).to have_selector('assignees assignee email', text: issue.assignees.first.public_email)
-        #expect(body).to have_selector('assignee email', text: issue.assignees.first.public_email)
+        # expect(body).to have_selector('author email', text: issue.author_public_email)
+        # expect(body).to have_selector('assignees assignee email', text: issue.assignees.first.public_email)
+        # expect(body).to have_selector('assignee email', text: issue.assignees.first.public_email)
         expect(body).to have_selector('entry summary', text: issue.title)
       end
     end
@@ -53,9 +53,9 @@ describe 'Issues Feed' do
         expect(response_headers['Content-Type'])
           .to have_content('application/atom+xml')
         expect(body).to have_selector('title', text: "#{project.name} issues")
-        #expect(body).to have_selector('author email', text: issue.author_public_email)
-        #expect(body).to have_selector('assignees assignee email', text: issue.assignees.first.public_email)
-        #expect(body).to have_selector('assignee email', text: issue.assignees.first.public_email)
+        # expect(body).to have_selector('author email', text: issue.author_public_email)
+        # expect(body).to have_selector('assignees assignee email', text: issue.assignees.first.public_email)
+        # expect(body).to have_selector('assignee email', text: issue.assignees.first.public_email)
         expect(body).to have_selector('entry summary', text: issue.title)
       end
     end