<p>This PR refactors the diary_entry tests to use the User factory instead of the fixtures. To simplify them I've created a "normal user" factory, which can log in without being redirected to view contributor terms etc.</p>
<p>I've tried to keep consistent naming for the tests, in most cases there are 'user' and 'other_user' objects replacing the 'normal_user' and 'public_user' fixtures.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/1449'>https://github.com/openstreetmap/openstreetmap-website/pull/1449</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Refactor diary entry tests to use User factory</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1449/files#diff-0">test/controllers/diary_entry_controller_test.rb</a>
    (255)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1449/files#diff-1">test/factories/user.rb</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1449/files#diff-2">test/models/diary_comment_test.rb</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1449/files#diff-3">test/models/diary_entry_test.rb</a>
    (2)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1449.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/1449.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/1449.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/1449.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/1449">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLTd0cW0AFKpUw0kLvic8w3JX0JfPks5reHHdgaJpZM4MFg1Q">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLWWZ79ozSBbpUdL3drA_zV86sboZks5reHHdgaJpZM4MFg1Q.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/openstreetmap/openstreetmap-website/pull/1449"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Refactor diary entry tests to use User factory (#1449)"}],"action":{"name":"View Pull Request","url":"https://github.com/openstreetmap/openstreetmap-website/pull/1449"}}}</script>