Commit fa71af71 authored Nov 25, 2016 by Justin Ramos Committed by Benjamin Neff Nov 27, 2016

require spec_helper in .rspec

closes #7223

parent 9f88850f

.rspec

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@
		--color
		--tag ~performance
		--order random
		--require spec_helper

Changelog.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		* Refactor flash messages on ajax errors for comments, likes, reshares and aspect memberships [#7202](https://github.com/diaspora/diaspora/pull/7202)
		* Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201)
		* Only show community spotlight links on the contacts page if community spotlight is enabled [#7213](https://github.com/diaspora/diaspora/pull/7213)
		* Require spec\_helper in .rspec [#7223](https://github.com/diaspora/diaspora/pull/7223)

		## Bug fixes
		* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)

spec/configuration_methods_spec.rb

+0 −2

Original line number	Diff line number	Diff line
		require "spec_helper"

		describe "ensure configuration effects" do
		it "sets the captcha length as required" do
		expect(SimpleCaptcha.length).to eq(AppConfig.settings.captcha.captcha_length.to_i)

spec/controllers/admin/pods_controller_spec.rb

+0 −3

Original line number	Diff line number	Diff line

		require "spec_helper"

		describe Admin::PodsController, type: :controller do
		before do
		@user = FactoryGirl.create :user

spec/controllers/admin/users_controller_spec.rb

+0 −3

Original line number	Diff line number	Diff line

		require 'spec_helper'

		describe Admin::UsersController, :type => :controller do
		before do
		@user = FactoryGirl.create :user