diff --git a/.codeclimate.yml b/.codeclimate.yml
index bca8b1aee..3a369a376 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -21,6 +21,10 @@ engines:
- javascript
fixme:
enabled: true
+ exclude_fingerprints: # rubocop_todo filename
+ - 63b8552079d106832fbe281566b6d028
+ - d38afbaaea3ecaa9a4cf046b07a01cec
+ - 57ff3968fd371d3e1f75c237d6c78acf
ratings:
paths:
- "**.rb"
diff --git a/.rubocop.yml b/.rubocop.yml
index 2b3877963..2631b0f0d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,1156 +1,68 @@
+inherit_from: .rubocop_todo.yml
AllCops:
- DisabledByDefault: true
+ Include:
+ - 'Rakefile'
+ - 'config.ru'
+ - 'lib/**/*.rake'
+ Exclude:
+ - 'db/schema.rb'
+ - 'vendor/**/*'
-#################### Lint ################################
+Style/FileName:
+ Exclude:
+ - 'Gemfile'
+ - 'Gemfile.lock'
-Lint/AmbiguousOperator:
- Description: >-
- Checks for ambiguous operators in the first argument of a
- method invocation without parentheses.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-as-args'
- Enabled: true
-
-Lint/AmbiguousRegexpLiteral:
- Description: >-
- Checks for ambiguous regexp literals in the first argument of
- a method invocation without parenthesis.
- Enabled: true
-
-Lint/AssignmentInCondition:
- Description: "Don't use assignment in conditions."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition'
- Enabled: true
-
-Lint/BlockAlignment:
- Description: 'Align block ends correctly.'
- Enabled: true
-
-Lint/CircularArgumentReference:
- Description: "Don't refer to the keyword argument in the default value."
- Enabled: true
-
-Lint/ConditionPosition:
- Description: >-
- Checks for condition placed in a confusing position relative to
- the keyword.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
- Enabled: true
-
-Lint/Debugger:
- Description: 'Check for debugger calls.'
- Enabled: true
-
-Lint/DefEndAlignment:
- Description: 'Align ends corresponding to defs correctly.'
- Enabled: true
-
-Lint/DeprecatedClassMethods:
- Description: 'Check for deprecated class method calls.'
- Enabled: true
-
-Lint/DuplicateMethods:
- Description: 'Check for duplicate methods calls.'
- Enabled: true
-
-Lint/EachWithObjectArgument:
- Description: 'Check for immutable argument given to each_with_object.'
- Enabled: true
-
-Lint/ElseLayout:
- Description: 'Check for odd code arrangement in an else block.'
- Enabled: true
-
-Lint/EmptyEnsure:
- Description: 'Checks for empty ensure block.'
- Enabled: true
-
-Lint/EmptyInterpolation:
- Description: 'Checks for empty string interpolation.'
- Enabled: true
-
-Lint/EndAlignment:
- Description: 'Align ends correctly.'
- Enabled: true
-
-Lint/EndInMethod:
- Description: 'END blocks should not be placed inside method definitions.'
- Enabled: true
-
-Lint/EnsureReturn:
- Description: 'Do not use return in an ensure block.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-return-ensure'
- Enabled: true
-
-Lint/Eval:
- Description: 'The use of eval represents a serious security risk.'
- Enabled: true
-
-Lint/FormatParameterMismatch:
- Description: 'The number of parameters to format/sprint must match the fields.'
- Enabled: true
-
-Lint/HandleExceptions:
- Description: "Don't suppress exception."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
- Enabled: true
-
-Lint/InvalidCharacterLiteral:
- Description: >-
- Checks for invalid character literals with a non-escaped
- whitespace character.
- Enabled: true
-
-Lint/LiteralInCondition:
- Description: 'Checks of literals used in conditions.'
- Enabled: true
-
-Lint/LiteralInInterpolation:
- Description: 'Checks for literals used in interpolation.'
- Enabled: true
-
-Lint/Loop:
- Description: >-
- Use Kernel#loop with break rather than begin/end/until or
- begin/end/while for post-loop tests.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#loop-with-break'
- Enabled: true
-
-Lint/NestedMethodDefinition:
- Description: 'Do not use nested method definitions.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-methods'
- Enabled: true
-
-Lint/NonLocalExitFromIterator:
- Description: 'Do not use return in iterator to cause non-local exit.'
- Enabled: true
-
-Lint/ParenthesesAsGroupedExpression:
- Description: >-
- Checks for method calls with a space before the opening
- parenthesis.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
- Enabled: true
-
-Lint/RequireParentheses:
- Description: >-
- Use parentheses in the method call to avoid confusion
- about precedence.
- Enabled: true
-
-Lint/RescueException:
- Description: 'Avoid rescuing the Exception class.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-blind-rescues'
- Enabled: true
-
-Lint/ShadowingOuterLocalVariable:
- Description: >-
- Do not use the same name as outer local variable
- for block arguments or block local variables.
- Enabled: true
-
-Lint/StringConversionInInterpolation:
- Description: 'Checks for Object#to_s usage in string interpolation.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-to-s'
- Enabled: true
-
-Lint/UnderscorePrefixedVariableName:
- Description: 'Do not use prefix `_` for a variable that is used.'
- Enabled: true
-
-Lint/UnneededDisable:
- Description: >-
- Checks for rubocop:disable comments that can be removed.
- Note: this cop is not disabled when disabling all cops.
- It must be explicitly disabled.
- Enabled: true
-
-Lint/UnusedBlockArgument:
- Description: 'Checks for unused block arguments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
- Enabled: true
-
-Lint/UnusedMethodArgument:
- Description: 'Checks for unused method arguments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
- Enabled: true
-
-Lint/UnreachableCode:
- Description: 'Unreachable code.'
- Enabled: true
-
-Lint/UselessAccessModifier:
- Description: 'Checks for useless access modifiers.'
- Enabled: true
-
-Lint/UselessAssignment:
- Description: 'Checks for useless assignment to a local variable.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
- Enabled: true
-
-Lint/UselessComparison:
- Description: 'Checks for comparison of something with itself.'
- Enabled: true
-
-Lint/UselessElseWithoutRescue:
- Description: 'Checks for useless `else` in `begin..end` without `rescue`.'
- Enabled: true
-
-Lint/UselessSetterCall:
- Description: 'Checks for useless setter call to a local variable.'
- Enabled: true
-
-Lint/Void:
- Description: 'Possible use of operator/literal/variable in void context.'
- Enabled: true
-
-###################### Metrics ####################################
-
-Metrics/AbcSize:
- Description: >-
- A calculated magnitude based on number of assignments,
- branches, and conditions.
- Reference: 'http://c2.com/cgi/wiki?AbcMetric'
- Enabled: true
- Max: 20
-
-Metrics/BlockNesting:
- Description: 'Avoid excessive block nesting'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count'
- Enabled: true
- Max: 4
-
-Metrics/ClassLength:
- Description: 'Avoid classes longer than 250 lines of code.'
- Enabled: true
- Max: 250
-
-Metrics/CyclomaticComplexity:
- Description: >-
- A complexity metric that is strongly correlated to the number
- of test cases needed to validate a method.
- Enabled: true
-
-Metrics/LineLength:
- Description: 'Limit lines to 80 characters.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
+Style/StringLiterals:
Enabled: false
+Style/MultilineMethodCallIndentation:
+ EnforcedStyle: indented
+
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Style/AlignParameters:
+ EnforcedStyle: with_fixed_indentation
+
Metrics/MethodLength:
Description: 'Avoid methods longer than 30 lines of code.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#short-methods'
- Enabled: true
- Max: 30
+ # Set to 30 once all methods are fixed.
+ # Max: 30
+ Max: 104
-Metrics/ModuleLength:
- Description: 'Avoid modules longer than 250 lines of code.'
- Enabled: true
- Max: 250
+# Remove the following once the code style matches
+# Offense count: 59
+Metrics/AbcSize:
+ Max: 115
-Metrics/ParameterLists:
- Description: 'Avoid parameter lists longer than three or four parameters.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#too-many-params'
- Enabled: true
+# Offense count: 5
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+ Max: 62
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+ Max: 275
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+ Max: 11
+
+Metrics/LineLength:
+ Max: 120
+
+# Offense count: 8
Metrics/PerceivedComplexity:
- Description: >-
- A complexity metric geared towards measuring complexity for a
- human reader.
- Enabled: true
+ Max: 10
-##################### Performance #############################
-
-Performance/Count:
- Description: >-
- Use `count` instead of `select...size`, `reject...size`,
- `select...count`, `reject...count`, `select...length`,
- and `reject...length`.
- Enabled: true
-
-Performance/Detect:
- Description: >-
- Use `detect` instead of `select.first`, `find_all.first`,
- `select.last`, and `find_all.last`.
- Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerabledetect-vs-enumerableselectfirst-code'
- Enabled: true
-
-Performance/FlatMap:
- Description: >-
- Use `Enumerable#flat_map`
- instead of `Enumerable#map...Array#flatten(1)`
- or `Enumberable#collect..Array#flatten(1)`
- Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablemaparrayflatten-vs-enumerableflat_map-code'
- Enabled: true
- EnabledForFlattenWithoutParams: true
- # If enabled, this cop will warn about usages of
- # `flatten` being called without any parameters.
- # This can be dangerous since `flat_map` will only flatten 1 level, and
- # `flatten` without any parameters can flatten multiple levels.
-
-Performance/ReverseEach:
- Description: 'Use `reverse_each` instead of `reverse.each`.'
- Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code'
- Enabled: true
-
-Performance/Sample:
- Description: >-
- Use `sample` instead of `shuffle.first`,
- `shuffle.last`, and `shuffle[Fixnum]`.
- Reference: 'https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code'
- Enabled: true
-
-Performance/Size:
- Description: >-
- Use `size` instead of `count` for counting
- the number of elements in `Array` and `Hash`.
- Reference: 'https://github.com/JuanitoFatas/fast-ruby#arraycount-vs-arraysize-code'
- Enabled: true
-
-Performance/StringReplacement:
- Description: >-
- Use `tr` instead of `gsub` when you are replacing the same
- number of characters. Use `delete` instead of `gsub` when
- you are deleting characters.
- Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code'
- Enabled: true
-
-##################### Rails ##################################
-
-Rails/ActionFilter:
- Description: 'Enforces consistent use of action filter methods.'
- Enabled: true
-
-Rails/Date:
- Description: >-
- Checks the correct usage of date aware methods,
- such as Date.today, Date.current etc.
- Enabled: true
-
-Rails/Delegate:
- Description: 'Prefer delegate method for delegations.'
- Enabled: true
-
-Rails/FindBy:
- Description: 'Prefer find_by over where.first.'
- Enabled: true
-
-Rails/FindEach:
- Description: 'Prefer all.find_each over all.find.'
- Enabled: true
-
-Rails/HasAndBelongsToMany:
- Description: 'Prefer has_many :through to has_and_belongs_to_many.'
- Enabled: true
-
-Rails/Output:
- Description: 'Checks for calls to puts, print, etc.'
- Enabled: true
-
-Rails/ReadWriteAttribute:
- Description: >-
- Checks for read_attribute(:attr) and
- write_attribute(:attr, val).
- Enabled: true
-
-Rails/ScopeArgs:
- Description: 'Checks the arguments of ActiveRecord scopes.'
- Enabled: true
-
-Rails/TimeZone:
- Description: 'Checks the correct usage of time zone aware methods.'
- StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
- Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
- Enabled: true
-
-Rails/Validation:
- Description: 'Use validates :attribute, hash of validations.'
- Enabled: true
-
-################## Style #################################
-
-Style/AccessModifierIndentation:
- Description: Check indentation of private/protected visibility modifiers.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#indent-public-private-protected'
- Enabled: true
-
-Style/AccessorMethodName:
- Description: Check the naming of accessor methods for get_/set_.
- Enabled: true
-
-Style/Alias:
- Description: 'Use alias_method instead of alias.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#alias-method'
- Enabled: true
-
-Style/AlignArray:
- Description: >-
- Align the elements of an array literal if they span more than
- one line.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays'
- Enabled: true
-
-Style/AlignHash:
- Description: >-
- Align the elements of a hash literal if they span more than
- one line.
- Enabled: true
-
-Style/AlignParameters:
- Description: >-
- Align the parameters of a method call if they span more
- than one line.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
- Enabled: true
-
-Style/AndOr:
- Description: 'Use &&/|| instead of and/or.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-and-or-or'
- Enabled: true
-
-Style/ArrayJoin:
- Description: 'Use Array#join instead of Array#*.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#array-join'
- Enabled: true
-
-Style/AsciiComments:
- Description: 'Use only ascii symbols in comments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#english-comments'
- Enabled: true
-
-Style/AsciiIdentifiers:
- Description: 'Use only ascii symbols in identifiers.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#english-identifiers'
- Enabled: true
-
-Style/Attr:
- Description: 'Checks for uses of Module#attr.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#attr'
- Enabled: true
-
-Style/BeginBlock:
- Description: 'Avoid the use of BEGIN blocks.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-BEGIN-blocks'
- Enabled: true
-
-Style/BarePercentLiterals:
- Description: 'Checks if usage of %() or %Q() matches configuration.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q-shorthand'
- Enabled: true
-
-Style/BlockComments:
- Description: 'Do not use block comments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-block-comments'
- Enabled: true
-
-Style/BlockEndNewline:
- Description: 'Put end statement of multiline block on its own line.'
- Enabled: true
-
-Style/BlockDelimiters:
- Description: >-
- Avoid using {...} for multi-line blocks (multiline chaining is
- always ugly).
- Prefer {...} over do...end for single-line blocks.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
- Enabled: true
-
-Style/BracesAroundHashParameters:
- Description: 'Enforce braces style around hash parameters.'
- Enabled: true
-
-Style/CaseEquality:
- Description: 'Avoid explicit use of the case equality operator(===).'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-case-equality'
- Enabled: true
-
-Style/CaseIndentation:
- Description: 'Indentation of when in a case/when/[else/]end.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#indent-when-to-case'
- Enabled: true
-
-Style/CharacterLiteral:
- Description: 'Checks for uses of character literals.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-character-literals'
- Enabled: true
-
-Style/ClassAndModuleCamelCase:
- Description: 'Use CamelCase for classes and modules.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#camelcase-classes'
- Enabled: true
-
-Style/ClassAndModuleChildren:
- Description: 'Checks style of children classes and modules.'
- Enabled: true
-
-Style/ClassCheck:
- Description: 'Enforces consistent use of `Object#is_a?` or `Object#kind_of?`.'
- Enabled: true
-
-Style/ClassMethods:
- Description: 'Use self when defining module/class methods.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#def-self-class-methods'
- Enabled: true
-
-Style/ClassVars:
- Description: 'Avoid the use of class variables.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-class-vars'
- Enabled: true
-
-Style/ClosingParenthesisIndentation:
- Description: 'Checks the indentation of hanging closing parentheses.'
- Enabled: true
-
-Style/ColonMethodCall:
- Description: 'Do not use :: for method call.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#double-colons'
- Enabled: true
-
-Style/CommandLiteral:
- Description: 'Use `` or %x around command literals.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-x'
- Enabled: true
-
-Style/CommentAnnotation:
- Description: 'Checks formatting of annotation comments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#annotate-keywords'
- Enabled: true
-
-Style/CommentIndentation:
- Description: 'Indentation of comments.'
- Enabled: true
-
-Style/ConstantName:
- Description: 'Constants should use SCREAMING_SNAKE_CASE.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#screaming-snake-case'
- Enabled: true
-
-Style/DefWithParentheses:
- Description: 'Use def with parentheses when there are arguments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
- Enabled: true
-
-Style/DeprecatedHashMethods:
- Description: 'Checks for use of deprecated Hash methods.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
- Enabled: true
-
-Style/Documentation:
- Description: 'Document classes and non-namespace modules.'
+# See https://github.com/bbatsov/rubocop/issues/3629
+Rails/HttpPositionalArguments:
Enabled: false
-Style/DotPosition:
- Description: 'Checks the position of the dot in multi-line method calls.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains'
- Enabled: true
+Style/Documentation:
+ Enabled: false
-Style/DoubleNegation:
- Description: 'Checks for uses of double negation (!!).'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-bang-bang'
- Enabled: true
-
-Style/EachWithObject:
- Description: 'Prefer `each_with_object` over `inject` or `reduce`.'
- Enabled: true
-
-Style/ElseAlignment:
- Description: 'Align elses and elsifs correctly.'
- Enabled: true
-
-Style/EmptyElse:
- Description: 'Avoid empty else-clauses.'
- Enabled: true
-
-Style/EmptyLineBetweenDefs:
- Description: 'Use empty lines between defs.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#empty-lines-between-methods'
- Enabled: true
-
-Style/EmptyLines:
- Description: "Don't use several empty lines in a row."
- Enabled: true
-
-Style/EmptyLinesAroundAccessModifier:
- Description: "Keep blank lines around access modifiers."
- Enabled: true
-
-Style/EmptyLinesAroundBlockBody:
- Description: "Keeps track of empty lines around block bodies."
- Enabled: true
-
-Style/EmptyLinesAroundClassBody:
- Description: "Keeps track of empty lines around class bodies."
- Enabled: true
-
-Style/EmptyLinesAroundModuleBody:
- Description: "Keeps track of empty lines around module bodies."
- Enabled: true
-
-Style/EmptyLinesAroundMethodBody:
- Description: "Keeps track of empty lines around method bodies."
- Enabled: true
-
-Style/EmptyLiteral:
- Description: 'Prefer literals to Array.new/Hash.new/String.new.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#literal-array-hash'
- Enabled: true
-
-Style/EndBlock:
- Description: 'Avoid the use of END blocks.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-END-blocks'
- Enabled: true
-
-Style/EndOfLine:
- Description: 'Use Unix-style line endings.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#crlf'
- Enabled: true
-
-Style/EvenOdd:
- Description: 'Favor the use of Fixnum#even? && Fixnum#odd?'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
- Enabled: true
-
-Style/ExtraSpacing:
- Description: 'Do not use unnecessary spacing.'
- Enabled: true
-
-Style/FileName:
- Description: 'Use snake_case for source file names.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files'
- Enabled: true
-
-Style/InitialIndentation:
- Description: >-
- Checks the indentation of the first non-blank non-comment line in a file.
- Enabled: true
-
-Style/FirstParameterIndentation:
- Description: 'Checks the indentation of the first parameter in a method call.'
- Enabled: true
-
-Style/FlipFlop:
- Description: 'Checks for flip flops'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-flip-flops'
- Enabled: true
-
-Style/For:
- Description: 'Checks use of for or each in multiline loops.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-for-loops'
- Enabled: true
-
-Style/FormatString:
- Description: 'Enforce the use of Kernel#sprintf, Kernel#format or String#%.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#sprintf'
- Enabled: true
-
-Style/GlobalVars:
- Description: 'Do not introduce global variables.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#instance-vars'
- Reference: 'http://www.zenspider.com/Languages/Ruby/QuickRef.html'
- Enabled: true
-
-Style/GuardClause:
- Description: 'Check for conditionals that can be replaced with guard clauses'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals'
- Enabled: true
-
-Style/HashSyntax:
- Description: >-
- Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax
- { :a => 1, :b => 2 }.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-literals'
- Enabled: true
-
-Style/IfUnlessModifier:
- Description: >-
- Favor modifier if/unless usage when you have a
- single-line body.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier'
- Enabled: true
-
-Style/IfWithSemicolon:
- Description: 'Do not use if x; .... Use the ternary operator instead.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs'
- Enabled: true
-
-Style/IndentationConsistency:
- Description: 'Keep indentation straight.'
- Enabled: true
-
-Style/IndentationWidth:
- Description: 'Use 2 spaces for indentation.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
- Enabled: true
-
-Style/IndentArray:
- Description: >-
- Checks the indentation of the first element in an array
- literal.
- Enabled: true
-
-Style/IndentHash:
- Description: 'Checks the indentation of the first key in a hash literal.'
- Enabled: true
-
-Style/InfiniteLoop:
- Description: 'Use Kernel#loop for infinite loops.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#infinite-loop'
- Enabled: true
-
-Style/Lambda:
- Description: 'Use the new lambda literal syntax for single-line blocks.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#lambda-multi-line'
- Enabled: true
-
-Style/LambdaCall:
- Description: 'Use lambda.call(...) instead of lambda.(...).'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#proc-call'
- Enabled: true
-
-Style/LeadingCommentSpace:
- Description: 'Comments should start with a space.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-space'
- Enabled: true
-
-Style/LineEndConcatenation:
- Description: >-
- Use \ instead of + or << to concatenate two string literals at
- line end.
- Enabled: true
-
-Style/MethodCallParentheses:
- Description: 'Do not use parentheses for method calls with no arguments.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
- Enabled: true
-
-Style/MethodDefParentheses:
- Description: >-
- Checks if the method definitions have or don't have
- parentheses.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
- Enabled: true
-
-Style/MethodName:
- Description: 'Use the configured style when naming methods.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars'
- Enabled: true
-
-Style/ModuleFunction:
- Description: 'Checks for usage of `extend self` in modules.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#module-function'
- Enabled: true
-
-Style/MultilineBlockChain:
- Description: 'Avoid multi-line chains of blocks.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
- Enabled: true
-
-Style/MultilineBlockLayout:
- Description: 'Ensures newlines after multiline block do statements.'
- Enabled: true
-
-Style/MultilineIfThen:
- Description: 'Do not use then for multi-line if/unless.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-then'
- Enabled: true
-
-Style/MultilineOperationIndentation:
- Description: >-
- Checks indentation of binary operations that span more than
- one line.
- Enabled: true
-
-Style/MultilineTernaryOperator:
- Description: >-
- Avoid multi-line ?: (the ternary operator);
- use if/unless instead.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-multiline-ternary'
- Enabled: true
-
-Style/NegatedIf:
- Description: >-
- Favor unless over if for negative conditions
- (or control flow or).
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#unless-for-negatives'
- Enabled: true
-
-Style/NegatedWhile:
- Description: 'Favor until over while for negative conditions.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#until-for-negatives'
- Enabled: true
-
-Style/NestedTernaryOperator:
- Description: 'Use one expression per branch in a ternary operator.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-ternary'
- Enabled: true
-
-Style/Next:
- Description: 'Use `next` to skip iteration instead of a condition at the end.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals'
- Enabled: true
-
-Style/NilComparison:
- Description: 'Prefer x.nil? to x == nil.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
- Enabled: true
-
-Style/NonNilCheck:
- Description: 'Checks for redundant nil checks.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-non-nil-checks'
- Enabled: true
-
-Style/Not:
- Description: 'Use ! instead of not.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bang-not-not'
- Enabled: true
-
-Style/NumericLiterals:
- Description: >-
- Add underscores to large numeric literals to improve their
- readability.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics'
- Enabled: true
-
-Style/OneLineConditional:
- Description: >-
- Favor the ternary operator(?:) over
- if/then/else/end constructs.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#ternary-operator'
- Enabled: true
-
-Style/OpMethod:
- Description: 'When defining binary operators, name the argument other.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#other-arg'
- Enabled: true
-
-Style/OptionalArguments:
- Description: >-
- Checks for optional arguments that do not appear at the end
- of the argument list
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#optional-arguments'
- Enabled: true
-
-Style/ParallelAssignment:
- Description: >-
- Check for simple usages of parallel assignment.
- It will only warn when the number of variables
- matches on both sides of the assignment.
- This also provides performance benefits
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parallel-assignment'
- Enabled: true
-
-Style/ParenthesesAroundCondition:
- Description: >-
- Don't use parentheses around the condition of an
- if/unless/while.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-parens-if'
- Enabled: true
-
-Style/PercentLiteralDelimiters:
- Description: 'Use `%`-literal delimiters consistently'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-literal-braces'
- Enabled: true
-
-Style/PercentQLiterals:
- Description: 'Checks if uses of %Q/%q match the configured preference.'
- Enabled: true
-
-Style/PerlBackrefs:
- Description: 'Avoid Perl-style regex back references.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
- Enabled: true
-
-Style/PredicateName:
- Description: 'Check the names of predicate methods.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark'
- Enabled: true
-
-Style/Proc:
- Description: 'Use proc instead of Proc.new.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#proc'
- Enabled: true
-
-Style/RaiseArgs:
- Description: 'Checks the arguments passed to raise/fail.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#exception-class-messages'
- Enabled: true
-
-Style/RedundantBegin:
- Description: "Don't use begin blocks when they are not needed."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#begin-implicit'
- Enabled: true
-
-Style/RedundantException:
- Description: "Checks for an obsolete RuntimeException argument in raise/fail."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-runtimeerror'
- Enabled: true
-
-Style/RedundantReturn:
- Description: "Don't use return where it's not required."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-return'
- Enabled: true
-
-Style/RedundantSelf:
- Description: "Don't use self where it's not needed."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-self-unless-required'
- Enabled: true
-
-Style/RegexpLiteral:
- Description: 'Use / or %r around regular expressions.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-r'
- Enabled: true
-
-Style/RescueEnsureAlignment:
- Description: 'Align rescues and ensures correctly.'
- Enabled: true
-
-Style/RescueModifier:
- Description: 'Avoid using rescue in its modifier form.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers'
- Enabled: true
-
-Style/SelfAssignment:
- Description: >-
- Checks for places where self-assignment shorthand should have
- been used.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#self-assignment'
- Enabled: true
-
-Style/Semicolon:
- Description: "Don't use semicolons to terminate expressions."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-semicolon'
- Enabled: true
-
-Style/SignalException:
- Description: 'Checks for proper usage of fail and raise.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'
- Enabled: true
-
-Style/SingleLineBlockParams:
- Description: 'Enforces the names of some block params.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#reduce-blocks'
- Enabled: true
-
-Style/SingleLineMethods:
- Description: 'Avoid single-line methods.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-single-line-methods'
- Enabled: true
-
-Style/SpaceBeforeFirstArg:
- Description: >-
- Checks that exactly one space is used between a method name
- and the first argument for method calls without parentheses.
- Enabled: true
-
-Style/SpaceAfterColon:
- Description: 'Use spaces after colons.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
- Enabled: true
-
-Style/SpaceAfterComma:
- Description: 'Use spaces after commas.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
- Enabled: true
-
-Style/SpaceAroundKeyword:
- Description: 'Use spaces around keywords.'
- Enabled: true
-
-Style/SpaceAfterMethodName:
- Description: >-
- Do not put a space between a method name and the opening
- parenthesis in a method definition.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
- Enabled: true
-
-Style/SpaceAfterNot:
- Description: Tracks redundant space after the ! operator.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-space-bang'
- Enabled: true
-
-Style/SpaceAfterSemicolon:
- Description: 'Use spaces after semicolons.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
- Enabled: true
-
-Style/SpaceBeforeBlockBraces:
- Description: >-
- Checks that the left block brace has or doesn't have space
- before it.
- Enabled: true
-
-Style/SpaceBeforeComma:
- Description: 'No spaces before commas.'
- Enabled: true
-
-Style/SpaceBeforeComment:
- Description: >-
- Checks for missing space between code and a comment on the
- same line.
- Enabled: true
-
-Style/SpaceBeforeSemicolon:
- Description: 'No spaces before semicolons.'
- Enabled: true
-
-Style/SpaceInsideBlockBraces:
- Description: >-
- Checks that block braces have or don't have surrounding space.
- For blocks taking parameters, checks that the left brace has
- or doesn't have trailing space.
- Enabled: true
-
-Style/SpaceAroundBlockParameters:
- Description: 'Checks the spacing inside and after block parameters pipes.'
- Enabled: true
-
-Style/SpaceAroundEqualsInParameterDefault:
- Description: >-
- Checks that the equals signs in parameter default assignments
- have or don't have surrounding space depending on
- configuration.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-around-equals'
- Enabled: true
-
-Style/SpaceAroundOperators:
- Description: 'Use a single space around operators.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
- Enabled: true
-
-Style/SpaceInsideBrackets:
- Description: 'No spaces after [ or before ].'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
- Enabled: true
-
-Style/SpaceInsideHashLiteralBraces:
- Description: "Use spaces inside hash literal braces - or don't."
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
- Enabled: true
-
-Style/SpaceInsideParens:
- Description: 'No spaces after ( or before ).'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
- Enabled: true
-
-Style/SpaceInsideRangeLiteral:
- Description: 'No spaces inside range literals.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-space-inside-range-literals'
- Enabled: true
-
-Style/SpaceInsideStringInterpolation:
- Description: 'Checks for padding/surrounding spaces inside string interpolation.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#string-interpolation'
- Enabled: true
-
-Style/SpecialGlobalVars:
- Description: 'Avoid Perl-style global variables.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms'
- Enabled: true
-
-Style/StringLiterals:
- Description: 'Checks if uses of quotes match the configured preference.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-string-literals'
- Enabled: true
-
-Style/StringLiteralsInInterpolation:
- Description: >-
- Checks if uses of quotes inside expressions in interpolated
- strings match the configured preference.
- Enabled: true
-
-Style/StructInheritance:
- Description: 'Checks for inheritance from Struct.new.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-extend-struct-new'
- Enabled: true
-
-Style/SymbolLiteral:
- Description: 'Use plain symbols instead of string symbols when possible.'
- Enabled: true
-
-Style/SymbolProc:
- Description: 'Use symbols as procs instead of blocks when possible.'
- Enabled: true
-
-Style/Tab:
- Description: 'No hard tabs.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
- Enabled: true
-
-Style/TrailingBlankLines:
- Description: 'Checks trailing blank lines and final newline.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
- Enabled: true
-
-Style/TrailingCommaInArguments:
- Description: 'Checks for trailing comma in parameter lists.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-params-comma'
- Enabled: true
-
-Style/TrailingCommaInLiteral:
- Description: 'Checks for trailing comma in literals.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
- Enabled: true
-
-Style/TrailingWhitespace:
- Description: 'Avoid trailing whitespace.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace'
- Enabled: true
-
-Style/TrivialAccessors:
- Description: 'Prefer attr_* methods to trivial readers/writers.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#attr_family'
- Enabled: true
-
-Style/UnlessElse:
- Description: >-
- Do not use unless with else. Rewrite these with the positive
- case first.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-else-with-unless'
- Enabled: true
-
-Style/UnneededCapitalW:
- Description: 'Checks for %W when interpolation is not needed.'
- Enabled: true
-
-Style/UnneededPercentQ:
- Description: 'Checks for %q/%Q when single quotes or double quotes would do.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q'
- Enabled: true
-
-Style/TrailingUnderscoreVariable:
- Description: >-
- Checks for the usage of unneeded trailing underscores at the
- end of parallel variable assignment.
- Enabled: true
-
-Style/VariableInterpolation:
- Description: >-
- Don't interpolate global, instance and class variables
- directly in strings.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#curlies-interpolate'
- Enabled: true
-
-Style/VariableName:
- Description: 'Use the configured style when naming variables.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars'
- Enabled: true
-
-Style/WhenThen:
- Description: 'Use when x then ... for one-line cases.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#one-line-cases'
- Enabled: true
-
-Style/WhileUntilDo:
- Description: 'Checks for redundant do after while or until.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-multiline-while-do'
- Enabled: true
-
-Style/WhileUntilModifier:
- Description: >-
- Favor modifier while/until usage when you have a
- single-line body.
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier'
- Enabled: true
-
-Style/WordArray:
- Description: 'Use %w or %W for arrays of words.'
- StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-w'
- Enabled: true
+Style/FrozenStringLiteralComment:
+ Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 000000000..93b7ab7c0
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,1095 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 500`
+# on 2016-11-13 10:16:38 +1300 using RuboCop version 0.45.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Lint/AmbiguousOperator:
+ Exclude:
+ - 'spec/factories/member.rb'
+
+# Offense count: 24
+Lint/AmbiguousRegexpLiteral:
+ Exclude:
+ - 'app/models/order.rb'
+ - 'spec/controllers/admin/orders_controller_spec.rb'
+ - 'spec/controllers/orders_controller_spec.rb'
+ - 'spec/features/cms_spec.rb'
+ - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
+ - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+ - 'spec/models/comment_spec.rb'
+ - 'spec/models/planting_spec.rb'
+ - 'spec/models/post_spec.rb'
+ - 'spec/views/members/show.rss.haml_spec.rb'
+ - 'spec/views/posts/show.html.haml_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+ Exclude:
+ - 'app/models/member.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+ Exclude:
+ - 'app/controllers/robots_controller.rb'
+ - 'config/boot.rb'
+
+# Offense count: 1
+Lint/HandleExceptions:
+ Exclude:
+ - 'lib/tasks/testing.rake'
+
+# Offense count: 8
+Lint/ParenthesesAsGroupedExpression:
+ Exclude:
+ - 'app/mailers/notifier.rb'
+ - 'spec/features/harvests/browse_harvests_spec.rb'
+ - 'spec/models/follow_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/views/plantings/show.html.haml_spec.rb'
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+ Exclude:
+ - 'app/controllers/crops_controller.rb'
+ - 'app/controllers/sessions_controller.rb'
+ - 'app/models/post.rb'
+ - 'config/unicorn.rb'
+ - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+ Exclude:
+ - 'app/controllers/application_controller.rb'
+ - 'app/controllers/passwords_controller.rb'
+ - 'app/controllers/registrations_controller.rb'
+ - 'app/models/crop.rb'
+ - 'app/validators/approved_validator.rb'
+ - 'spec/views/plantings/show.html.haml_spec.rb'
+
+# Offense count: 52
+Lint/UselessAssignment:
+ Exclude:
+ - 'app/controllers/crops_controller.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/member.rb'
+ - 'config.rb'
+ - 'config/compass.rb'
+ - 'config/setup_load_paths.rb'
+ - 'db/seeds.rb'
+ - 'lib/tasks/growstuff.rake'
+ - 'spec/controllers/admin/orders_controller_spec.rb'
+ - 'spec/features/signin_spec.rb'
+ - 'spec/features/unsubscribing_spec.rb'
+ - 'spec/helpers/gardens_helper_spec.rb'
+ - 'spec/helpers/notifications_helper_spec.rb'
+ - 'spec/helpers/seeds_helper_spec.rb'
+ - 'spec/models/crop_spec.rb'
+ - 'spec/models/garden_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/support/controller_macros.rb'
+
+# Offense count: 5
+Lint/Void:
+ Exclude:
+ - 'spec/models/crop_spec.rb'
+ - 'spec/models/garden_spec.rb'
+ - 'spec/models/post_spec.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Performance/StringReplacement:
+ Exclude:
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/seed.rb'
+ - 'spec/rails_helper.rb'
+
+# Offense count: 21
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, Include.
+# SupportedStyles: action, filter
+# Include: app/controllers/**/*.rb
+Rails/ActionFilter:
+ Exclude:
+ - 'app/controllers/account_types_controller.rb'
+ - 'app/controllers/accounts_controller.rb'
+ - 'app/controllers/alternate_names_controller.rb'
+ - 'app/controllers/application_controller.rb'
+ - 'app/controllers/authentications_controller.rb'
+ - 'app/controllers/comments_controller.rb'
+ - 'app/controllers/crops_controller.rb'
+ - 'app/controllers/follows_controller.rb'
+ - 'app/controllers/gardens_controller.rb'
+ - 'app/controllers/harvests_controller.rb'
+ - 'app/controllers/notifications_controller.rb'
+ - 'app/controllers/order_items_controller.rb'
+ - 'app/controllers/orders_controller.rb'
+ - 'app/controllers/plantings_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'app/controllers/products_controller.rb'
+ - 'app/controllers/roles_controller.rb'
+ - 'app/controllers/scientific_names_controller.rb'
+ - 'app/controllers/seeds_controller.rb'
+
+# Offense count: 10
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/Date:
+ Exclude:
+ - 'app/controllers/harvests_controller.rb'
+ - 'app/controllers/plantings_controller.rb'
+ - 'db/seeds.rb'
+ - 'lib/tasks/growstuff.rake'
+ - 'spec/controllers/plantings_controller_spec.rb'
+ - 'spec/factories/planting.rb'
+ - 'spec/features/plantings/planting_a_crop_spec.rb'
+ - 'spec/features/shared_examples/append_date.rb'
+
+# Offense count: 42
+# Cop supports --auto-correct.
+# Configuration parameters: Whitelist.
+# Whitelist: find_by_sql
+Rails/DynamicFindBy:
+ Exclude:
+ - 'app/controllers/alternate_names_controller.rb'
+ - 'app/controllers/comments_controller.rb'
+ - 'app/controllers/gardens_controller.rb'
+ - 'app/controllers/harvests_controller.rb'
+ - 'app/controllers/notifications_controller.rb'
+ - 'app/controllers/plantings_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'app/controllers/scientific_names_controller.rb'
+ - 'app/controllers/seeds_controller.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/member.rb'
+ - 'app/models/order.rb'
+ - 'db/seeds.rb'
+ - 'lib/tasks/growstuff.rake'
+ - 'spec/controllers/roles_controller_spec.rb'
+ - 'spec/models/crop_spec.rb'
+ - 'spec/models/scientific_name_spec.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/FindBy:
+ Exclude:
+ - 'app/models/member.rb'
+ - 'app/models/post.rb'
+
+# Offense count: 11
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasAndBelongsToMany:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/member.rb'
+ - 'app/models/photo.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/post.rb'
+ - 'app/models/product.rb'
+ - 'app/models/role.rb'
+
+# Offense count: 89
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: spec/**/*, test/**/*
+Rails/HttpPositionalArguments:
+ Exclude:
+ - 'spec/controllers/admin/orders_controller_spec.rb'
+ - 'spec/controllers/comments_controller_spec.rb'
+ - 'spec/controllers/crops_controller_spec.rb'
+ - 'spec/controllers/harvests_controller_spec.rb'
+ - 'spec/controllers/member_controller_spec.rb'
+ - 'spec/controllers/notifications_controller_spec.rb'
+ - 'spec/controllers/order_items_controller_spec.rb'
+ - 'spec/controllers/orders_controller_spec.rb'
+ - 'spec/controllers/places_controller_spec.rb'
+ - 'spec/controllers/plantings_controller_spec.rb'
+ - 'spec/controllers/posts_controller_spec.rb'
+ - 'spec/controllers/roles_controller_spec.rb'
+ - 'spec/controllers/scientific_names_controller_spec.rb'
+ - 'spec/controllers/seeds_controller_spec.rb'
+ - 'spec/controllers/shop_controller_spec.rb'
+
+# Offense count: 15
+# Configuration parameters: Include.
+# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
+Rails/Output:
+ Exclude:
+ - 'config/unicorn.rb'
+ - 'db/seeds.rb'
+
+# Offense count: 3
+Rails/OutputSafety:
+ Exclude:
+ - 'app/helpers/application_helper.rb'
+ - 'app/helpers/auto_suggest_helper.rb'
+ - 'app/helpers/gardens_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Rails/PluralizationGrammar:
+ Exclude:
+ - 'spec/features/plantings/planting_a_crop_spec.rb'
+ - 'spec/models/member_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: referer, referrer
+Rails/RequestReferer:
+ Exclude:
+ - 'app/controllers/application_controller.rb'
+
+# Offense count: 9
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+ Exclude:
+ - 'app/helpers/plantings_helper.rb'
+ - 'spec/controllers/accounts_controller_spec.rb'
+ - 'spec/factories/member.rb'
+ - 'spec/factories/post.rb'
+ - 'spec/models/post_spec.rb'
+ - 'spec/views/plantings/index.html.haml_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/Validation:
+ Exclude:
+ - 'app/models/member.rb'
+ - 'app/models/order_item.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+ Exclude:
+ - 'app/models/notification.rb'
+ - 'app/models/photo.rb'
+ - 'config/unicorn.rb'
+ - 'lib/tasks/growstuff.rake'
+
+# Offense count: 2
+Style/AsciiComments:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'config/initializers/comfortable_mexican_sofa.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+ Exclude:
+ - 'app/helpers/auto_suggest_helper.rb'
+ - 'spec/support/feature_helpers.rb'
+
+# Offense count: 25
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+ Exclude:
+ - 'app/controllers/alternate_names_controller.rb'
+ - 'app/controllers/members_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'app/controllers/scientific_names_controller.rb'
+ - 'spec/controllers/harvests_controller_spec.rb'
+ - 'spec/controllers/order_items_controller_spec.rb'
+ - 'spec/features/notifications_spec.rb'
+ - 'spec/models/ability_spec.rb'
+ - 'spec/models/comment_spec.rb'
+ - 'spec/models/follow_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/models/planting_spec.rb'
+ - 'spec/models/post_spec.rb'
+ - 'spec/views/crops/edit.html.haml_spec.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+ Exclude:
+ - 'app/controllers/members_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'spec/models/ability_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/models/planting_spec.rb'
+
+# Offense count: 93
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+ Exclude:
+ - 'app/controllers/admin/orders_controller.rb'
+ - 'app/controllers/crops_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'app/helpers/application_helper.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/member.rb'
+ - 'app/models/order.rb'
+ - 'config/environments/test.rb'
+ - 'spec/controllers/admin/orders_controller_spec.rb'
+ - 'spec/controllers/comments_controller_spec.rb'
+ - 'spec/controllers/harvests_controller_spec.rb'
+ - 'spec/controllers/member_controller_spec.rb'
+ - 'spec/controllers/notifications_controller_spec.rb'
+ - 'spec/controllers/order_items_controller_spec.rb'
+ - 'spec/controllers/orders_controller_spec.rb'
+ - 'spec/controllers/places_controller_spec.rb'
+ - 'spec/controllers/plantings_controller_spec.rb'
+ - 'spec/controllers/posts_controller_spec.rb'
+ - 'spec/controllers/scientific_names_controller_spec.rb'
+ - 'spec/controllers/seeds_controller_spec.rb'
+ - 'spec/lib/actions/oauth_signup_action_spec.rb'
+ - 'spec/views/notifier/notify.html.haml_spec.rb'
+ - 'spec/views/photos/new.html.haml_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+ Exclude:
+ - 'app/controllers/admin/orders_controller.rb'
+ - 'lib/actions/oauth_signup_action.rb'
+ - 'lib/haml/filters/escaped_markdown.rb'
+ - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/ClassMethods:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'app/models/member.rb'
+ - 'app/models/order.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/post.rb'
+ - 'app/models/seed.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/ColonMethodCall:
+ Exclude:
+ - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
+ - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+Style/CommentAnnotation:
+ Exclude:
+ - 'app/controllers/crops_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/DefWithParentheses:
+ Exclude:
+ - 'spec/views/posts/_single.html.haml_spec.rb'
+
+# Offense count: 178
+Style/Documentation:
+ Exclude:
+ - 'spec/**/*'
+ - 'test/**/*'
+ - 'app/controllers/account_types_controller.rb'
+ - 'app/controllers/accounts_controller.rb'
+ - 'app/controllers/admin/orders_controller.rb'
+ - 'app/controllers/admin_controller.rb'
+ - 'app/controllers/alternate_names_controller.rb'
+ - 'app/controllers/application_controller.rb'
+ - 'app/controllers/authentications_controller.rb'
+ - 'app/controllers/comments_controller.rb'
+ - 'app/controllers/crops_controller.rb'
+ - 'app/controllers/follows_controller.rb'
+ - 'app/controllers/forums_controller.rb'
+ - 'app/controllers/gardens_controller.rb'
+ - 'app/controllers/harvests_controller.rb'
+ - 'app/controllers/home_controller.rb'
+ - 'app/controllers/members_controller.rb'
+ - 'app/controllers/notifications_controller.rb'
+ - 'app/controllers/order_items_controller.rb'
+ - 'app/controllers/orders_controller.rb'
+ - 'app/controllers/pages_controller.rb'
+ - 'app/controllers/passwords_controller.rb'
+ - 'app/controllers/photos_controller.rb'
+ - 'app/controllers/places_controller.rb'
+ - 'app/controllers/plant_parts_controller.rb'
+ - 'app/controllers/plantings_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'app/controllers/products_controller.rb'
+ - 'app/controllers/registrations_controller.rb'
+ - 'app/controllers/robots_controller.rb'
+ - 'app/controllers/roles_controller.rb'
+ - 'app/controllers/scientific_names_controller.rb'
+ - 'app/controllers/seeds_controller.rb'
+ - 'app/controllers/sessions_controller.rb'
+ - 'app/controllers/shop_controller.rb'
+ - 'app/helpers/application_helper.rb'
+ - 'app/helpers/auto_suggest_helper.rb'
+ - 'app/helpers/crops_helper.rb'
+ - 'app/helpers/gardens_helper.rb'
+ - 'app/helpers/harvests_helper.rb'
+ - 'app/helpers/notifications_helper.rb'
+ - 'app/helpers/plantings_helper.rb'
+ - 'app/helpers/seeds_helper.rb'
+ - 'app/mailers/notifier.rb'
+ - 'app/models/ability.rb'
+ - 'app/models/account.rb'
+ - 'app/models/account_type.rb'
+ - 'app/models/alternate_name.rb'
+ - 'app/models/authentication.rb'
+ - 'app/models/comment.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/follow.rb'
+ - 'app/models/forum.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/member.rb'
+ - 'app/models/notification.rb'
+ - 'app/models/order.rb'
+ - 'app/models/order_item.rb'
+ - 'app/models/photo.rb'
+ - 'app/models/plant_part.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/post.rb'
+ - 'app/models/product.rb'
+ - 'app/models/role.rb'
+ - 'app/models/scientific_name.rb'
+ - 'app/models/seed.rb'
+ - 'app/validators/approved_validator.rb'
+ - 'config/application.rb'
+ - 'config/initializers/comfortable_mexican_sofa.rb'
+ - 'db/migrate/20120903092956_devise_create_users.rb'
+ - 'db/migrate/20120903112806_add_username_to_users.rb'
+ - 'db/migrate/20121001212604_create_crops.rb'
+ - 'db/migrate/20121003190731_require_system_name_for_crops.rb'
+ - 'db/migrate/20121027035231_add_slug_to_crops.rb'
+ - 'db/migrate/20121105032913_create_gardens.rb'
+ - 'db/migrate/20121106101718_add_slug_to_users.rb'
+ - 'db/migrate/20121107012827_create_scientific_names.rb'
+ - 'db/migrate/20121108105440_create_updates.rb'
+ - 'db/migrate/20121109130033_add_creation_index_to_updates.rb'
+ - 'db/migrate/20121203034745_add_tos_agreement_to_users.rb'
+ - 'db/migrate/20121214224227_add_slug_to_updates.rb'
+ - 'db/migrate/20121219022554_create_plantings.rb'
+ - 'db/migrate/20130113045802_rename_updates_to_posts.rb'
+ - 'db/migrate/20130113060852_rename_users_to_members.rb'
+ - 'db/migrate/20130113081521_rename_post_member_to_author.rb'
+ - 'db/migrate/20130113095802_rename_garden_member_to_owner.rb'
+ - 'db/migrate/20130118031942_add_description_to_gardens.rb'
+ - 'db/migrate/20130118043431_add_slug_to_plantings.rb'
+ - 'db/migrate/20130206033956_create_comments.rb'
+ - 'db/migrate/20130206051328_add_show_email_to_member.rb'
+ - 'db/migrate/20130208034248_require_fields_for_comments.rb'
+ - 'db/migrate/20130212001748_add_geo_to_members.rb'
+ - 'db/migrate/20130212123628_create_notifications.rb'
+ - 'db/migrate/20130213014511_create_forums.rb'
+ - 'db/migrate/20130213015708_add_forum_to_posts.rb'
+ - 'db/migrate/20130214024117_create_roles.rb'
+ - 'db/migrate/20130214034838_add_members_roles_table.rb'
+ - 'db/migrate/20130215131921_rename_notification_fields.rb'
+ - 'db/migrate/20130220044605_add_slug_to_forums.rb'
+ - 'db/migrate/20130220044642_add_slug_to_roles.rb'
+ - 'db/migrate/20130222060730_default_read_to_false.rb'
+ - 'db/migrate/20130326092227_change_planted_at_to_date.rb'
+ - 'db/migrate/20130327120024_add_send_email_to_member.rb'
+ - 'db/migrate/20130329045744_add_sunniness_to_planting.rb'
+ - 'db/migrate/20130404174459_create_authentications.rb'
+ - 'db/migrate/20130409103549_make_post_subject_non_null.rb'
+ - 'db/migrate/20130409162140_add_name_to_authentications.rb'
+ - 'db/migrate/20130507105357_create_products.rb'
+ - 'db/migrate/20130507110411_create_orders.rb'
+ - 'db/migrate/20130507113915_add_orders_products_table.rb'
+ - 'db/migrate/20130508050711_add_completed_to_order.rb'
+ - 'db/migrate/20130508104506_create_photos.rb'
+ - 'db/migrate/20130509123711_add_metadata_to_photos.rb'
+ - 'db/migrate/20130514124515_add_parent_to_crop.rb'
+ - 'db/migrate/20130515033842_create_order_items.rb'
+ - 'db/migrate/20130515054017_change_order_member_id_to_integer.rb'
+ - 'db/migrate/20130515122301_change_prices_to_integers.rb'
+ - 'db/migrate/20130517015920_create_account_details.rb'
+ - 'db/migrate/20130517051922_create_account_types.rb'
+ - 'db/migrate/20130517234458_require_account_type_name.rb'
+ - 'db/migrate/20130518000339_add_columns_to_product.rb'
+ - 'db/migrate/20130518002942_rename_account_detail_to_account.rb'
+ - 'db/migrate/20130529032813_add_express_token_to_orders.rb'
+ - 'db/migrate/20130531110729_add_photos_plantings_table.rb'
+ - 'db/migrate/20130601011725_change_flickr_photo_id_to_string.rb'
+ - 'db/migrate/20130606230333_change_product_description_to_text.rb'
+ - 'db/migrate/20130606233733_add_recommended_price_to_product.rb'
+ - 'db/migrate/20130705104238_add_planted_from_to_planting.rb'
+ - 'db/migrate/20130715110134_create_seeds.rb'
+ - 'db/migrate/20130718005600_change_use_by_to_plant_before_on_seed.rb'
+ - 'db/migrate/20130718011247_add_trading_to_seeds.rb'
+ - 'db/migrate/20130722050836_remove_tradable_from_seeds.rb'
+ - 'db/migrate/20130723103128_set_default_tradable_to_on_seed.rb'
+ - 'db/migrate/20130723110702_add_slug_to_seed.rb'
+ - 'db/migrate/20130809012511_add_bio_to_members.rb'
+ - 'db/migrate/20130819004549_add_planting_count_to_crop.rb'
+ - 'db/migrate/20130821011352_add_creator_to_crops.rb'
+ - 'db/migrate/20130821073736_add_creator_to_scientific_name.rb'
+ - 'db/migrate/20130826012139_add_owner_to_planting.rb'
+ - 'db/migrate/20130826023159_add_plantings_count_to_member.rb'
+ - 'db/migrate/20130827105823_add_newsletter_to_member.rb'
+ - 'db/migrate/20130913015118_add_referral_code_to_order.rb'
+ - 'db/migrate/20130917053547_create_harvests.rb'
+ - 'db/migrate/20130917060257_change_harvest_notes_to_description.rb'
+ - 'db/migrate/20130917071545_change_harvest_units_to_unit.rb'
+ - 'db/migrate/20130917075803_add_slug_to_harvests.rb'
+ - 'db/migrate/20130925050304_add_weight_to_harvests.rb'
+ - 'db/migrate/20131018101204_rename_system_name_to_name.rb'
+ - 'db/migrate/20131025104228_add_fields_to_gardens.rb'
+ - 'db/migrate/20131029053113_add_plant_part_to_harvests.rb'
+ - 'db/migrate/20131030230908_create_plant_parts.rb'
+ - 'db/migrate/20131030231202_change_plant_part_to_plant_part_id.rb'
+ - 'db/migrate/20131031000655_add_slug_to_plant_part.rb'
+ - 'db/migrate/20140718075753_default_plantings_count_to_zero.rb'
+ - 'db/migrate/20140829230600_add_finished_to_planting.rb'
+ - 'db/migrate/20140905001730_add_harvests_photos_table.rb'
+ - 'db/migrate/20140928044231_add_crops_posts_table.rb'
+ - 'db/migrate/20140928085713_add_send_planting_reminder_to_member.rb'
+ - 'db/migrate/20141002022459_create_index_harvest_photos.rb'
+ - 'db/migrate/20141018111015_create_alternate_names.rb'
+ - 'db/migrate/20141111130849_create_follows.rb'
+ - 'db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb'
+ - 'db/migrate/20150124110540_add_properties_to_seeds.rb'
+ - 'db/migrate/20150127043022_add_gardens_photos_table.rb'
+ - 'db/migrate/20150129034206_add_si_weight_to_harvest.rb'
+ - 'db/migrate/20150130224814_add_requester_to_crops.rb'
+ - 'db/migrate/20150201052245_create_cms.rb'
+ - 'db/migrate/20150201053200_add_approval_status_to_crops.rb'
+ - 'db/migrate/20150201062506_add_reason_for_rejection_to_crops.rb'
+ - 'db/migrate/20150201064502_add_request_notes_to_crops.rb'
+ - 'db/migrate/20150209105410_add_rejection_notes_to_crops.rb'
+ - 'db/migrate/20150625224805_add_days_before_maturity_to_plantings.rb'
+ - 'db/migrate/20150824145414_add_member_preferred_image.rb'
+ - 'lib/actions/oauth_signup_action.rb'
+ - 'lib/geocodable.rb'
+ - 'lib/haml/filters/escaped_markdown.rb'
+ - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/EachForSimpleLoop:
+ Exclude:
+ - 'spec/models/crop_spec.rb'
+ - 'spec/views/home/_crops.html.haml_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLiteral:
+ Exclude:
+ - 'app/models/member.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: for, each
+Style/For:
+ Exclude:
+ - 'app/models/order.rb'
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: format, sprintf, percent
+Style/FormatString:
+ Exclude:
+ - 'app/helpers/application_helper.rb'
+ - 'spec/helpers/application_helper_spec.rb'
+ - 'spec/views/shop/index_spec.rb'
+
+# Offense count: 35
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+ Exclude:
+ - 'app/controllers/members_controller.rb'
+ - 'app/helpers/harvests_helper.rb'
+ - 'app/helpers/plantings_helper.rb'
+ - 'app/mailers/notifier.rb'
+ - 'app/models/ability.rb'
+ - 'app/models/account.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/member.rb'
+ - 'app/models/notification.rb'
+ - 'app/models/order.rb'
+ - 'app/models/order_item.rb'
+ - 'app/models/photo.rb'
+ - 'app/models/seed.rb'
+ - 'app/validators/approved_validator.rb'
+ - 'config/initializers/comfortable_mexican_sofa.rb'
+ - 'lib/geocodable.rb'
+ - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+ - 'spec/support/elasticsearch_helpers.rb'
+
+# Offense count: 4
+Style/IdenticalConditionalBranches:
+ Exclude:
+ - 'app/controllers/crops_controller.rb'
+ - 'app/controllers/follows_controller.rb'
+
+# Offense count: 1
+Style/IfInsideElse:
+ Exclude:
+ - 'app/models/harvest.rb'
+
+# Offense count: 26
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+ Exclude:
+ - 'app/controllers/gardens_controller.rb'
+ - 'app/controllers/shop_controller.rb'
+ - 'app/helpers/crops_helper.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/member.rb'
+ - 'app/models/order.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/seed.rb'
+ - 'config/initializers/geocoder.rb'
+ - 'lib/tasks/growstuff.rake'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+ Exclude:
+ - 'spec/controllers/member_controller_spec.rb'
+ - 'spec/models/photo_spec.rb'
+
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+ Exclude:
+ - 'app/models/photo.rb'
+ - 'spec/helpers/application_helper_spec.rb'
+ - 'spec/views/plantings/new.html.haml_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineArrayBraceLayout:
+ Exclude:
+ - 'app/models/seed.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+ Exclude:
+ - 'app/controllers/members_controller.rb'
+ - 'app/controllers/posts_controller.rb'
+ - 'spec/models/ability_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/models/planting_spec.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineHashBraceLayout:
+ Exclude:
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/product.rb'
+ - 'app/models/seed.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+ Exclude:
+ - 'spec/rails_helper.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/MultilineIfThen:
+ Exclude:
+ - 'lib/tasks/growstuff.rake'
+ - 'script/check_contributors_md'
+ - 'script/gemfile_check'
+
+# Offense count: 93
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineMethodCallBraceLayout:
+ Exclude:
+ - 'app/controllers/application_controller.rb'
+ - 'app/controllers/authentications_controller.rb'
+ - 'app/controllers/seeds_controller.rb'
+ - 'app/models/account.rb'
+ - 'app/models/crop.rb'
+ - 'spec/controllers/order_items_controller_spec.rb'
+ - 'spec/helpers/gardens_helper_spec.rb'
+ - 'spec/helpers/harvests_helper_spec.rb'
+ - 'spec/helpers/plantings_helper_spec.rb'
+ - 'spec/helpers/seeds_helper_spec.rb'
+ - 'spec/models/ability_spec.rb'
+ - 'spec/models/crop_spec.rb'
+ - 'spec/models/harvest_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/models/order_spec.rb'
+ - 'spec/models/plant_part_spec.rb'
+ - 'spec/models/planting_spec.rb'
+ - 'spec/models/post_spec.rb'
+ - 'spec/views/account_types/edit.html.haml_spec.rb'
+ - 'spec/views/account_types/new.html.haml_spec.rb'
+ - 'spec/views/account_types/show.html.haml_spec.rb'
+ - 'spec/views/crops/_grown_for.html.haml_spec.rb'
+ - 'spec/views/crops/_planting_advice.html.haml_spec.rb'
+ - 'spec/views/forums/edit.html.haml_spec.rb'
+ - 'spec/views/harvests/index.html.haml_spec.rb'
+ - 'spec/views/orders/show.html.haml_spec.rb'
+ - 'spec/views/photos/edit.html.haml_spec.rb'
+ - 'spec/views/plant_parts/edit.html.haml_spec.rb'
+ - 'spec/views/plant_parts/new.html.haml_spec.rb'
+ - 'spec/views/plantings/_form.html.haml_spec.rb'
+ - 'spec/views/plantings/edit.html.haml_spec.rb'
+ - 'spec/views/plantings/index.html.haml_spec.rb'
+ - 'spec/views/plantings/new.html.haml_spec.rb'
+ - 'spec/views/plantings/show.html.haml_spec.rb'
+ - 'spec/views/posts/edit.html.haml_spec.rb'
+ - 'spec/views/products/edit.html.haml_spec.rb'
+ - 'spec/views/products/new.html.haml_spec.rb'
+ - 'spec/views/roles/edit.html.haml_spec.rb'
+ - 'spec/views/roles/index.html.haml_spec.rb'
+ - 'spec/views/roles/new.html.haml_spec.rb'
+ - 'spec/views/roles/show.html.haml_spec.rb'
+ - 'spec/views/scientific_names/edit.html.haml_spec.rb'
+ - 'spec/views/scientific_names/show.html.haml_spec.rb'
+
+# Offense count: 2
+Style/MultilineTernaryOperator:
+ Exclude:
+ - 'app/controllers/notifications_controller.rb'
+ - 'app/controllers/order_items_controller.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/MutableConstant:
+ Exclude:
+ - 'app/controllers/members_controller.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/seed.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/NegatedIf:
+ Exclude:
+ - 'app/controllers/crops_controller.rb'
+ - 'app/helpers/crops_helper.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/garden.rb'
+ - 'script/check_contributors_md'
+
+# Offense count: 2
+Style/NestedTernaryOperator:
+ Exclude:
+ - 'app/controllers/harvests_controller.rb'
+ - 'app/controllers/plantings_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+ Exclude:
+ - 'app/models/post.rb'
+ - 'lib/tasks/growstuff.rake'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/NilComparison:
+ Exclude:
+ - 'lib/tasks/growstuff.rake'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IncludeSemanticChanges.
+Style/NonNilCheck:
+ Exclude:
+ - 'app/models/harvest.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
+# SupportedOctalStyles: zero_with_o, zero_only
+Style/NumericLiteralPrefix:
+ Exclude:
+ - 'spec/views/plantings/_form.html.haml_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+ MinDigits: 9
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+ Exclude:
+ - 'spec/**/*'
+ - 'app/helpers/crops_helper.rb'
+ - 'app/helpers/harvests_helper.rb'
+ - 'app/helpers/plantings_helper.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/photo.rb'
+ - 'lib/tasks/growstuff.rake'
+ - 'script/check_contributors_md'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/ParallelAssignment:
+ Exclude:
+ - 'app/mailers/notifier.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowSafeAssignment.
+Style/ParenthesesAroundCondition:
+ Exclude:
+ - 'app/controllers/application_controller.rb'
+ - 'app/controllers/orders_controller.rb'
+ - 'app/helpers/crops_helper.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/member.rb'
+ - 'config/factory_girl.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+ Exclude:
+ - 'app/helpers/auto_suggest_helper.rb'
+ - 'script/check_contributors_md'
+ - 'spec/features/signin_spec.rb'
+ - 'spec/features/signout_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+ Exclude:
+ - 'app/models/post.rb'
+ - 'lib/haml/filters/growstuff_markdown.rb'
+
+# Offense count: 3
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+ Exclude:
+ - 'spec/**/*'
+ - 'app/models/member.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+ Exclude:
+ - 'app/controllers/members_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantParentheses:
+ Exclude:
+ - 'app/helpers/plantings_helper.rb'
+ - 'app/models/garden.rb'
+
+# Offense count: 62
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+ Exclude:
+ - 'app/helpers/application_helper.rb'
+ - 'app/helpers/harvests_helper.rb'
+ - 'app/helpers/plantings_helper.rb'
+ - 'app/mailers/notifier.rb'
+ - 'app/models/account.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/forum.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/member.rb'
+ - 'app/models/order.rb'
+ - 'app/models/photo.rb'
+ - 'app/models/plant_part.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/seed.rb'
+ - 'lib/haml/filters/escaped_markdown.rb'
+ - 'lib/haml/filters/growstuff_markdown.rb'
+ - 'spec/controllers/accounts_controller_spec.rb'
+ - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+ - 'spec/views/devise/shared/_links_spec.rb'
+
+# Offense count: 56
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+ Exclude:
+ - 'app/models/comment.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/follow.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/member.rb'
+ - 'app/models/notification.rb'
+ - 'app/models/order.rb'
+ - 'app/models/photo.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/post.rb'
+ - 'app/models/seed.rb'
+ - 'lib/geocodable.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+ - 'spec/rails_helper.rb'
+ - 'spec/views/devise/registrations/edit_spec.rb'
+ - 'spec/views/members/index.html.haml_spec.rb'
+ - 'spec/views/posts/index.html.haml_spec.rb'
+ - 'spec/views/posts/show.html.haml_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SelfAssignment:
+ Exclude:
+ - 'app/helpers/crops_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: use_perl_names, use_english_names
+Style/SpecialGlobalVars:
+ EnforcedStyle: use_perl_names
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+ Exclude:
+ - 'app/models/follow.rb'
+ - 'app/models/post.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+ Exclude:
+ - 'app/controllers/crops_controller.rb'
+ - 'app/models/crop.rb'
+ - 'app/models/garden.rb'
+ - 'app/models/harvest.rb'
+ - 'app/models/planting.rb'
+ - 'app/models/post.rb'
+ - 'lib/tasks/growstuff.rake'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# SupportedStyles: require_parentheses, require_no_parentheses
+Style/TernaryParentheses:
+ Exclude:
+ - 'app/helpers/plantings_helper.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInArguments:
+ Exclude:
+ - 'app/models/post.rb'
+ - 'db/seeds.rb'
+ - 'lib/actions/oauth_signup_action.rb'
+ - 'lib/tasks/growstuff.rake'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'config/environments/test.rb'
+ - 'spec/rails_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnlessElse:
+ Exclude:
+ - 'app/controllers/omniauth_callbacks_controller.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+Style/UnneededInterpolation:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'app/models/harvest.rb'
+ - 'spec/features/crops/crop_wranglers_spec.rb'
+ - 'spec/features/following_spec.rb'
+ - 'spec/features/shared_examples/append_date.rb'
+ - 'spec/models/crop_spec.rb'
+ - 'spec/models/forum_spec.rb'
+ - 'spec/models/member_spec.rb'
+ - 'spec/models/plant_part_spec.rb'
+ - 'spec/views/layouts/_header_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+ Exclude:
+ - 'spec/support/feature_helpers.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, MinSize, WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+ Exclude:
+ - 'app/controllers/omniauth_callbacks_controller.rb'
+ - 'app/models/crop.rb'
+ - 'spec/models/seed_spec.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+ Exclude:
+ - 'app/models/crop.rb'
+ - 'app/models/photo.rb'
diff --git a/.travis.yml b/.travis.yml
index 4b181855a..3aefec912 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
sudo: false
language: ruby
-cache: bundler
+cache:
+ bundler: true
+ directories:
+ - travis_phantomjs
env:
matrix:
- GROWSTUFF_SITE_NAME="Growstuff (travis)" RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' GROWSTUFF_ELASTICSEARCH='true'
@@ -8,14 +11,26 @@ env:
global:
secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
rvm:
-- 2.3.1
+ - 2.3.1
+before_install:
+ - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
+ - >
+ if [ $(phantomjs --version) != '2.1.1' ]; then
+ PHANTOM_URL=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2;
+ rm -rf $PWD/travis_phantomjs;
+ mkdir -p $PWD/travis_phantomjs;
+ wget $PHANTOM_URL -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2;
+ tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs;
+ fi
+ - phantomjs --version
before_script:
-- psql -c 'create database growstuff_test;' -U postgres
+ - bundle exec rake db:create db:migrate db:test:prepare
script:
-- script/gemfile_check
-- bundle exec script/check_contributors_md
-- bundle exec rake db:migrate --trace
-- bundle exec rspec spec/
+ - bundle exec rubocop --display-cop-names --rails
+ - script/gemfile_check
+ - bundle exec script/check_contributors_md
+ - bundle exec rake db:migrate --trace
+ - bundle exec rspec spec/
services:
- elasticsearch
before_deploy:
@@ -28,6 +43,7 @@ deploy:
repo: Growstuff/growstuff
app:
dev: growstuff-staging
+ master: growstuff-prod
travis_deploy: tranquil-basin-3130
travis_containers: tranquil-basin-3130
run:
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 000000000..06876caa2
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,7 @@
+extends: relaxed
+
+rules:
+ # 80 chars should be enough, but don't fail if a line is longer
+ line-length:
+ max: 150
+ level: warning
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 1df2129ff..f4c22eccf 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -71,4 +71,4 @@ submit the change with your pull request.
- Lucas Nogueira / [lucasnogueira](https://github.com/lucasnogueira)
- Charley Lewittes / [ctlewitt](https://github.com/ctlewitt)
- Kristine Nicole Polvoriza / [polveenomials](https://github.com/polveenomials)
-- Brenda Wallace / [br3nda](http://github.com/br3nda)
+- Brenda Wallace / [br3nda](https://github.com/br3nda)
diff --git a/Gemfile b/Gemfile
index b63bbd54b..e752f553a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
source 'https://rubygems.org'
ruby '2.3.1'
@@ -14,11 +15,11 @@ gem 'haml'
gem 'bootstrap-sass', '~> 3.3.6'
gem 'font-awesome-sass'
-gem 'uglifier', '~> 2.7.2' # JavaScript compressor
+gem 'uglifier', '~> 2.7.2' # JavaScript compressor
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 5.0.2'
-gem 'js-routes' # provides access to Rails routes in Javascript
+gem 'js-routes' # provides access to Rails routes in Javascript
gem 'flickraw'
gem 'leaflet-rails'
@@ -68,7 +69,7 @@ gem 'omniauth-flickr', '>= 0.0.15'
gem 'omniauth-facebook'
# client for Elasticsearch. Elasticsearch is a flexible
-# and powerful, distributed, real-time search and analytics engine.
+# and powerful, distributed, real-time search and analytics engine.
# An example of the use in the project is fuzzy crop search.
gem "elasticsearch-model"
gem "elasticsearch-rails"
@@ -80,7 +81,7 @@ group :production, :staging do
gem 'dalli'
gem 'memcachier'
gem 'rails_12factor' # supresses heroku plugin injection
- gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
+ gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
gem 'sparkpost_rails'
end
@@ -109,11 +110,15 @@ group :development, :test do
gem 'capybara' # integration tests
gem 'capybara-email' # integration tests for email
gem 'capybara-screenshot' # for test debugging
- gem 'poltergeist', '~> 1.6' # for headless JS testing
+ gem 'poltergeist' # for headless JS testing
gem 'i18n-tasks' # adds tests for finding missing and unused translations
gem 'selenium-webdriver'
- gem "codeclimate-test-reporter", group: :test, require: nil
gem "active_merchant-paypal-bogus-gateway"
+ gem 'rubocop', require: false
+end
+
+group :test do
+ gem 'codeclimate-test-reporter', require: false
end
group :travis do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2ca0ee862..618de9759 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,13 +24,13 @@ GEM
actionpack
active_merchant-paypal-bogus-gateway (0.1.0)
activemerchant
- active_utils (3.2.2)
+ active_utils (3.2.3)
activesupport (>= 3.2, < 5.1.0)
i18n
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
- activemerchant (1.60.0)
+ activemerchant (1.61.0)
activesupport (>= 3.2.14, < 5.1)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.9)
@@ -48,7 +48,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.4.0)
+ addressable (2.5.0)
+ public_suffix (~> 2.0, >= 2.0.2)
arel (6.0.3)
ast (2.3.0)
autoprefixer-rails (6.4.0.2)
@@ -70,11 +71,11 @@ GEM
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
- bootstrap_form (2.5.0)
+ bootstrap_form (2.5.2)
builder (3.2.2)
- byebug (9.0.5)
+ byebug (9.0.6)
cancancan (1.15.0)
- capybara (2.8.0)
+ capybara (2.10.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -84,7 +85,7 @@ GEM
capybara-email (2.5.0)
capybara (~> 2.4)
mail
- capybara-screenshot (1.0.13)
+ capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3)
launchy
childprocess (0.5.9)
@@ -123,10 +124,10 @@ GEM
sass-rails (>= 4.0.3)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
- coveralls (0.8.15)
+ coveralls (0.8.16)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
- term-ansicolor (~> 1.3)
+ term-ansicolor (~> 1.3.0)
thor (~> 0.19.1)
tins (>= 1.6.0, < 2)
csv_shaper (1.3.0)
@@ -160,7 +161,7 @@ GEM
faraday
multi_json
erubis (2.7.0)
- excon (0.51.0)
+ excon (0.54.0)
execjs (2.7.0)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
@@ -222,7 +223,7 @@ GEM
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.7.0)
- i18n-tasks (0.9.5)
+ i18n-tasks (0.9.6)
activesupport (>= 4.0.2)
ast (>= 2.1.0)
easy_translate (>= 0.5.0)
@@ -242,12 +243,12 @@ GEM
railties (>= 3.2)
sprockets-rails
json (1.8.3)
- jwt (1.5.4)
+ jwt (1.5.6)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.10.0)
- kramdown (1.12.0)
+ kramdown (1.13.1)
launchy (2.4.3)
addressable (~> 2.3)
leaflet-markercluster-rails (0.7.0)
@@ -271,15 +272,14 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_portile2 (2.1.0)
- minitest (5.9.0)
+ minitest (5.9.1)
multi_json (1.11.3)
multi_xml (0.5.5)
multipart-post (2.0.0)
nenv (0.3.0)
- newrelic_rpm (3.16.1.320)
- nokogiri (1.6.8)
+ newrelic_rpm (3.17.1.326)
+ nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
@@ -314,23 +314,24 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
- parser (2.3.1.2)
+ parser (2.3.2.0)
ast (~> 2.2)
- pg (0.18.4)
- pkg-config (1.1.7)
+ pg (0.19.0)
plupload-rails (1.2.1)
rails (>= 3.1)
- poltergeist (1.10.0)
+ poltergeist (1.11.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
+ powerpack (0.1.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
+ public_suffix (2.0.4)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
- rack (1.6.4)
+ rack (1.6.5)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
@@ -367,12 +368,13 @@ GEM
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
+ rainbow (2.1.0)
raindrops (0.17.0)
- rake (11.2.2)
- rb-fsevent (0.9.7)
+ rake (11.3.0)
+ rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
- redis (3.3.1)
+ redis (3.3.2)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rspec (3.5.0)
@@ -383,7 +385,7 @@ GEM
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
- rspec-core (3.5.2)
+ rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
@@ -391,7 +393,7 @@ GEM
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
- rspec-rails (3.5.1)
+ rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -400,9 +402,16 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
+ rubocop (0.45.0)
+ parser (>= 2.3.1.1, < 3.0)
+ powerpack (~> 0.1)
+ rainbow (>= 1.99.1, < 3.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (~> 1.0, >= 1.0.1)
+ ruby-progressbar (1.8.1)
ruby-units (2.0.1)
ruby_dep (1.4.0)
- ruby_parser (3.8.2)
+ ruby_parser (3.8.3)
sexp_processor (~> 4.1)
rubyzip (1.2.0)
sass (3.4.22)
@@ -444,17 +453,19 @@ GEM
sprockets (>= 3.0.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
- terminal-table (1.6.0)
- thor (0.19.1)
+ terminal-table (1.7.3)
+ unicode-display_width (~> 1.1.1)
+ thor (0.19.3)
thread (0.2.2)
thread_safe (0.3.5)
tilt (2.0.5)
- tins (1.12.0)
+ tins (1.13.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
+ unicode-display_width (1.1.1)
unicorn (5.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
@@ -530,7 +541,7 @@ DEPENDENCIES
omniauth-flickr (>= 0.0.15)
omniauth-twitter
pg
- poltergeist (~> 1.6)
+ poltergeist
pry
quiet_assets
rails (~> 4.2.1)
@@ -538,6 +549,7 @@ DEPENDENCIES
rake (>= 10.0.0)
rspec-activemodel-mocks
rspec-rails
+ rubocop
ruby-units
sass-rails (~> 5.0.4)
selenium-webdriver
@@ -552,4 +564,4 @@ RUBY VERSION
ruby 2.3.1p112
BUNDLED WITH
- 1.12.5
+ 1.13.6
diff --git a/app/assets/images/facebook-login-splash.png b/app/assets/images/facebook-login-splash.png
new file mode 100644
index 000000000..445a00b30
Binary files /dev/null and b/app/assets/images/facebook-login-splash.png differ
diff --git a/app/assets/javascripts/append_date.js.coffee b/app/assets/javascripts/append_date.js.coffee
index 470ae7923..64c782a94 100644
--- a/app/assets/javascripts/append_date.js.coffee
+++ b/app/assets/javascripts/append_date.js.coffee
@@ -5,7 +5,7 @@
jQuery ->
el = $('.append-date')
-
+
el.datepicker({'format': 'yyyy-mm-dd'})
el.click (e) ->
diff --git a/app/assets/javascripts/seeds.js.coffee b/app/assets/javascripts/seeds.js.coffee
index 500c851d9..ab88a1163 100644
--- a/app/assets/javascripts/seeds.js.coffee
+++ b/app/assets/javascripts/seeds.js.coffee
@@ -42,4 +42,3 @@ $ ->
element = document.getElementById(tmp)
console.log("%s",tmp)
element.remove()
-
\ No newline at end of file
diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass
index eb2b8a49d..3261470ca 100644
--- a/app/assets/stylesheets/overrides.sass
+++ b/app/assets/stylesheets/overrides.sass
@@ -2,7 +2,7 @@
@import "bootstrap"
@import "custom_bootstrap/variables"
// this padding needs to be done before the responsive stuff is imported
-body
+body
// modifying this for our promotional banner. can be replaced after if
// needed.
// padding-top: $navbar-height + 15px
@@ -19,14 +19,14 @@ body
//@import "bootstrap/glyphicons"
-.list-inline > li.first
+.list-inline > li.first
padding-left: 0px
-h2
+h2
font-size: 150%
-//#subtitle
+//#subtitle
// color: lighten($brown, 30%)
// font-style: italic
// font-weight: normal
@@ -34,10 +34,10 @@ h2
// padding-left: 1em
// padding-top: 0px
-h3
+h3
font-size: 120%
-.main
+.main
padding-right: 1em
.navbar .navbar-form
@@ -59,24 +59,24 @@ h3
padding-left: 1em
// this is used for eg. crops and members index pages
-.six-across:nth-child(6n+1)
+.six-across:nth-child(6n+1)
margin-left: 0px
-.three-across:nth-child(3n+1)
+.three-across:nth-child(3n+1)
margin-left: 0px
clear: both
// let's condense the hero unit a little
-.jumbotron
+.jumbotron
padding-top: 30px
padding-bottom: 30px
// info under the main heading on homepage
-.jumbotron .info
+.jumbotron .info
padding-top: 15px
// signup widget on homepage
-.jumbotron .signup
+.jumbotron .signup
background-color: lighten($green, 40%)
border: 1px solid lighten($green, 20%)
border-radius: 6px
@@ -85,19 +85,19 @@ h3
text-align: center
// stats shown on homepage. eg. "999 members..."
-p.stats
+p.stats
font-weight: bold
-.member-cards
+.member-cards
display: flex
flex: none
flex-wrap: wrap
justify-content: space-between
-.member-thumbnail
+.member-thumbnail
padding: .25em
- div
+ div
width: 5em
display: inline-block
vertical-align: top
@@ -116,7 +116,7 @@ p.stats
margin-left: auto
@media (min-width: $screen-md-min)
- .planting-thumbnail
+ .planting-thumbnail
dl.planting-attributes
font-size: 85%
width: 100%
@@ -132,10 +132,10 @@ p.stats
width: 250px
-#placesmap, #cropmap
+#placesmap, #cropmap
height: 500px
-#membermap
+#membermap
height: 250px
.location-not-set
@@ -145,23 +145,23 @@ p.stats
background-repeat: no-repeat
background-position: center
-.member-location
+.member-location
font-size: small
font-style: italic
-.member-location a
+.member-location a
color: $brown
-.photo-thumbnail
+.photo-thumbnail
padding: 0
position: relative
img
width: 100%
-
- .text
+
+ .text
display: none
color: #000
position: absolute
@@ -169,100 +169,100 @@ p.stats
background: rgba(0, 0, 0, 0.8)
width: 100%
margin: 0
-
- p
+
+ p
padding: 5px
margin: 0
color: #fff
-
- &:hover
- .text
+
+ &:hover
+ .text
display: block
-.thumbnail
+.thumbnail
border: none
text-align: center
margin-bottom: 1.5em
- .member-thumbnail
+ .member-thumbnail
text-align: left
- img
+ img
height: 85px
width: 85px
max-width: 85px
- .crop-thumbnail
+ .crop-thumbnail
height: 220px
- .cropinfo
+ .cropinfo
display: inline-block
max-width: 100%
white-space: nowrap
line-height: 1em
padding-bottom: 2px
- .cropname
+ .cropname
overflow: hidden
text-overflow: ellipsis
- .scientificname
+ .scientificname
font-size: small
font-style: italic
overflow: hidden
text-overflow: ellipsis
- .plantingcount
+ .plantingcount
font-size: small
- .crop-name a
+ .crop-name a
padding-top: 2px
- .scientific-name small
+ .scientific-name small
margin-bottom: -2px
-li.crop-hierarchy
+li.crop-hierarchy
list-style-type: disc
-.navbar-brand
+.navbar-brand
margin: 0px
padding: 0px
-.navbar-bottom
+.navbar-bottom
margin: 40px 0px 0px 0px !important
// footer
-footer
- #footer1, #footer2, #footer3
+footer
+ #footer1, #footer2, #footer3
text-align: left
padding-top: 1em
padding-bottom: 2em
- ul
+ ul
list-style-type: none
list-style-position: outside
padding-left: 0px
margin-left: 0px
-
- a
+
+ a
color: $navbar-default-link-color
text-decoration: none
-
- a:hover
+
+ a:hover
color: $navbar-default-link-hover-color
-
- a:active
+
+ a:active
color: $navbar-default-link-active-color
- .navbar-bottom.navbar
+ .navbar-bottom.navbar
border-radius: 0
// ensure footer is pushed to bottom of browser window
-#maincontainer
+#maincontainer
min-height: 80%
-html, body
+html, body
height: 100%
-.crop-image, .member-image
+.crop-image, .member-image
width: 100%
height: 100%
@@ -272,22 +272,22 @@ html, body
background: white
z-index: $zindex-tooltip
-.alert
- a
+.alert
+ a
font-weight: 800
// Overrides applying only to mobile view. This must be at the end of the overrides file.
-@media only screen and (max-width: 767px)
- .sidebar
+@media only screen and (max-width: 767px)
+ .sidebar
margin-left: 0
border-left: none
padding-left: 0
- #map
+ #map
height: 300px
- .navbar .nav > li
+ .navbar .nav > li
display: block
.navbar .navbar-form
@@ -305,7 +305,7 @@ $state-info-bg: lighten($green, 50%)
$state-success-text: darken($green, 10%)
$state-success-bg: lighten($green, 50%)
-.hide
+.hide
display: none
#add-sci_name-row, #remove-sci_name-row, #add-alt_name-row, #remove-alt_name-row
@@ -322,14 +322,14 @@ $state-success-bg: lighten($green, 50%)
#gardens_panel_body
height: 20em
-.form-group.required .control-label:before
+.form-group.required .control-label:before
content: "* "
color: red
-.margin-bottom
+.margin-bottom
margin-bottom: 1em
-.red
+.red
color: red
.truncate
diff --git a/app/controllers/account_types_controller.rb b/app/controllers/account_types_controller.rb
index 4c3da9080..073933af4 100644
--- a/app/controllers/account_types_controller.rb
+++ b/app/controllers/account_types_controller.rb
@@ -1,7 +1,7 @@
class AccountTypesController < ApplicationController
before_filter :authenticate_member!
load_and_authorize_resource
-
+
# GET /account_types
def index
@account_types = AccountType.all
@@ -70,7 +70,7 @@ class AccountTypesController < ApplicationController
end
end
- private
+ private
def account_type_params
params.require(:account_type).permit(:is_paid, :is_permanent_paid, :name)
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index cdfcc2d00..b2daf95ed 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,7 +1,7 @@
class AccountsController < ApplicationController
before_filter :authenticate_member!
load_and_authorize_resource
-
+
# GET /accounts
def index
@accounts = Account.all
@@ -43,5 +43,4 @@ class AccountsController < ApplicationController
def account_params
params.require(:account).permit(:account_type_id, :member_id, :paid_until)
end
-
end
diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb
index c092ba7f2..574afc024 100644
--- a/app/controllers/admin/orders_controller.rb
+++ b/app/controllers/admin/orders_controller.rb
@@ -8,7 +8,7 @@ class Admin::OrdersController < ApplicationController
def search
authorize! :manage, :all
- @orders = Order.search({by: params[:search_by], for: params[:search_text]})
+ @orders = Order.search({ by: params[:search_by], for: params[:search_text] })
if @orders.empty?
flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"
@@ -17,6 +17,5 @@ class Admin::OrdersController < ApplicationController
respond_to do |format|
format.html # index.html.haml
end
-
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f082d13cf..45c657b64 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base
request.path != "/members/confirmation" &&
request.path != "/members/sign_out" &&
!request.xhr?)
- store_location_for(:member, request.fullpath)
+ store_location_for(:member, request.fullpath)
end
end
@@ -73,10 +73,9 @@ class ApplicationController < ActionController::Base
:bio, :location, :latitude, :longitude,
# email settings
:show_email, :newsletter, :send_notification_email, :send_planting_reminder,
- #update password
+ # update password
:current_password
)
end
end
-
end
diff --git a/app/controllers/authentications_controller.rb b/app/controllers/authentications_controller.rb
index 34ed65aa8..886715373 100644
--- a/app/controllers/authentications_controller.rb
+++ b/app/controllers/authentications_controller.rb
@@ -10,15 +10,15 @@ class AuthenticationsController < ApplicationController
name = Growstuff::OauthSignupAction.new.determine_name(auth)
@authentication = current_member.authentications
- .create_with(
- name: name,
- token: auth['credentials']['token'],
- secret: auth['credentials']['secret']
- )
- .find_or_create_by(
- provider: auth['provider'],
- uid: auth['uid'],
- name: name)
+ .create_with(
+ name: name,
+ token: auth['credentials']['token'],
+ secret: auth['credentials']['secret']
+ )
+ .find_or_create_by(
+ provider: auth['provider'],
+ uid: auth['uid'],
+ name: name)
flash[:notice] = "Authentication successful."
else
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 884727646..0f078e2dd 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -89,7 +89,7 @@ class CommentsController < ApplicationController
end
end
- private
+ private
def comment_params
params.require(:comment).permit(:author_id, :body, :post_id)
diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 2833a2bf0..dac763665 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -11,11 +11,11 @@ class CropsController < ApplicationController
@sort = params[:sort]
if @sort == 'alpha'
# alphabetical order
- @crops = Crop.includes(:scientific_names, {plantings: :photos})
+ @crops = Crop.includes(:scientific_names, { plantings: :photos })
@paginated_crops = @crops.approved.paginate(page: params[:page])
else
# default to sorting by popularity
- @crops = Crop.popular.includes(:scientific_names, {plantings: :photos})
+ @crops = Crop.popular.includes(:scientific_names, { plantings: :photos })
@paginated_crops = @crops.approved.paginate(page: params[:page])
end
@@ -37,14 +37,14 @@ class CropsController < ApplicationController
# GET /crops/wrangle
def wrangle
@approval_status = params[:approval_status]
- case @approval_status
- when "pending"
- @crops = Crop.pending_approval
- when "rejected"
- @crops = Crop.rejected
- else
- @crops = Crop.recent
- end
+ @crops = case @approval_status
+ when "pending"
+ Crop.pending_approval
+ when "rejected"
+ Crop.rejected
+ else
+ Crop.recent
+ end
@crops = @crops.paginate(page: params[:page])
@@ -77,7 +77,7 @@ class CropsController < ApplicationController
# GET /crops/1
# GET /crops/1.json
def show
- @crop = Crop.includes(:scientific_names, {plantings: :photos}).find(params[:id])
+ @crop = Crop.includes(:scientific_names, { plantings: :photos }).find(params[:id])
@posts = @crop.posts.paginate(page: params[:page])
respond_to do |format|
@@ -86,14 +86,14 @@ class CropsController < ApplicationController
# TODO RABL or similar one day to avoid presentation logic here
owner_structure = {
owner: {
- only: [:id, :login_name, :location, :latitude, :longitude]
+ only: [:id, :login_name, :location, :latitude, :longitude]
}
}
render json: @crop.to_json(include: {
- plantings: {
- include: owner_structure
- }
- })
+ plantings: {
+ include: owner_structure
+ }
+ })
end
end
end
@@ -116,13 +116,11 @@ class CropsController < ApplicationController
@crop = Crop.find(params[:id])
@crop.alternate_names.build if @crop.alternate_names.blank?
@crop.scientific_names.build if @crop.scientific_names.blank?
-
end
# POST /crops
# POST /crops.json
def create
-
@crop = Crop.new(crop_params)
if current_member.has_role? :crop_wrangler
@@ -137,10 +135,10 @@ class CropsController < ApplicationController
respond_to do |format|
if @crop.save
params[:alt_name].each do |index, value|
- @crop.alternate_names.create(name: value, creator_id: current_member.id)
+ @crop.alternate_names.create(name: value, creator_id: current_member.id)
end
params[:sci_name].each do |index, value|
- @crop.scientific_names.create(scientific_name: value, creator_id: current_member.id)
+ @crop.scientific_names.create(scientific_name: value, creator_id: current_member.id)
end
unless current_member.has_role? :crop_wrangler
Role.crop_wranglers.each do |w|
@@ -184,7 +182,7 @@ class CropsController < ApplicationController
sci_name = @crop.scientific_names.create(scientific_name: value, creator_id: current_member.id)
end
end
-
+
if previous_status == "pending"
requester = @crop.requester
new_status = @crop.approval_status
@@ -215,6 +213,15 @@ class CropsController < ApplicationController
private
def crop_params
- params.require(:crop).permit(:en_wikipedia_url, :name, :parent_id, :creator_id, :approval_status, :request_notes, :reason_for_rejection, :rejection_notes, scientific_names_attributes: [:scientific_name, :_destroy, :id])
+ params.require(:crop).permit(:en_wikipedia_url,
+ :name,
+ :parent_id,
+ :creator_id,
+ :approval_status,
+ :request_notes,
+ :reason_for_rejection,
+ :rejection_notes, scientific_names_attributes: [:scientific_name,
+ :_destroy,
+ :id])
end
end
diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
index 2e2e5ec48..58a1ce795 100644
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -5,11 +5,10 @@ class FollowsController < ApplicationController
# POST /follows
def create
-
@follow = current_member.follows.build(followed_id: follow_params[:followed_id])
if @follow.save
- flash[:notice] = "Followed #{ @follow.followed.login_name }"
+ flash[:notice] = "Followed #{@follow.followed.login_name}"
redirect_to :back
else
flash[:error] = "Already following or error while following."
@@ -23,7 +22,7 @@ class FollowsController < ApplicationController
unfollowed_name = @follow.followed.login_name
@follow.destroy
- flash[:notice] = "Unfollowed #{ unfollowed_name }"
+ flash[:notice] = "Unfollowed #{unfollowed_name}"
redirect_to root_path
end
diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb
index 68bb919c4..5820b83d3 100644
--- a/app/controllers/gardens_controller.rb
+++ b/app/controllers/gardens_controller.rb
@@ -2,7 +2,6 @@ class GardensController < ApplicationController
before_filter :authenticate_member!, except: [:index, :show]
load_and_authorize_resource
-
# GET /gardens
# GET /gardens.json
def index
@@ -87,7 +86,9 @@ class GardensController < ApplicationController
expire_fragment("homepage_stats")
respond_to do |format|
- format.html { redirect_to gardens_by_owner_path(owner: @garden.owner), notice: 'Garden was successfully deleted.' }
+ format.html do
+ redirect_to gardens_by_owner_path(owner: @garden.owner), notice: 'Garden was successfully deleted.'
+ end
format.json { head :no_content }
end
end
@@ -96,6 +97,6 @@ class GardensController < ApplicationController
def garden_params
params.require(:garden).permit(:name, :slug, :owner_id, :description, :active,
- :location, :latitude, :longitude, :area, :area_unit)
+ :location, :latitude, :longitude, :area, :area_unit)
end
end
diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb
index 13dcedea7..051cb1132 100644
--- a/app/controllers/harvests_controller.rb
+++ b/app/controllers/harvests_controller.rb
@@ -1,20 +1,19 @@
class HarvestsController < ApplicationController
before_filter :authenticate_member!, except: [:index, :show]
load_and_authorize_resource
-
# GET /harvests
# GET /harvests.json
def index
@owner = Member.find_by_slug(params[:owner])
@crop = Crop.find_by_slug(params[:crop])
- if @owner
- @harvests = @owner.harvests.includes(:owner, :crop)
- elsif @crop
- @harvests = @crop.harvests.includes(:owner, :crop)
- else
- @harvests = Harvest.includes(:owner, :crop)
- end
+ @harvests = if @owner
+ @owner.harvests.includes(:owner, :crop)
+ elsif @crop
+ @crop.harvests.includes(:owner, :crop)
+ else
+ Harvest.includes(:owner, :crop)
+ end
respond_to do |format|
format.html { @harvests = @harvests.paginate(page: params[:page]) }
@@ -33,7 +32,7 @@ class HarvestsController < ApplicationController
@harvest = Harvest.new('harvested_at' => Date.today)
# using find_by_id here because it returns nil, unlike find
- @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
+ @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
respond_to do |format|
format.html # new.html.erb
@@ -96,6 +95,6 @@ class HarvestsController < ApplicationController
def harvest_params
params.require(:harvest).permit(:crop_id, :harvested_at, :description, :owner_id,
- :quantity, :unit, :weight_quantity, :weight_unit, :plant_part_id, :slug, :si_weight)
+ :quantity, :unit, :weight_quantity, :weight_unit, :plant_part_id, :slug, :si_weight)
end
end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 69e9a95a2..9eb6e5003 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,7 +2,6 @@ class HomeController < ApplicationController
skip_authorize_resource
def index
-
# we were previously generating a lot of instance variables like
# @members_count and @interesting_crops in here, but now we call
# the relevant class methods directly in the view, so that fragment
@@ -12,5 +11,4 @@ class HomeController < ApplicationController
format.html # index.html.haml
end
end
-
end
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index b586e2b55..d13a5e843 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -7,15 +7,19 @@ class MembersController < ApplicationController
def index
@sort = params[:sort]
- if @sort == 'recently_joined'
- @members = Member.confirmed.recently_joined.paginate(page: params[:page])
- else
- @members = Member.confirmed.paginate(page: params[:page])
- end
+ @members = if @sort == 'recently_joined'
+ Member.confirmed.recently_joined.paginate(page: params[:page])
+ else
+ Member.confirmed.paginate(page: params[:page])
+ end
respond_to do |format|
format.html # index.html.haml
- format.json { render json: @members.to_json(only: [:id, :login_name, :slug, :bio, :created_at, :location, :latitude, :longitude]) }
+ format.json {
+ render json: @members.to_json(only: [
+ :id, :login_name, :slug, :bio, :created_at, :location, :latitude, :longitude
+ ])
+ }
end
end
@@ -29,10 +33,14 @@ class MembersController < ApplicationController
# it requires a garden to be passed in @garden.
# The new garden is not persisted unless Garden#save is called.
@garden = Garden.new
-
+
respond_to do |format|
format.html # show.html.haml
- format.json { render json: @member.to_json(only: [:id, :login_name, :bio, :created_at, :slug, :location, :latitude, :longitude]) }
+ format.json {
+ render json: @member.to_json(only: [
+ :id, :login_name, :bio, :created_at, :slug, :location, :latitude, :longitude
+ ])
+ }
format.rss { render(
layout: false,
locals: { member: @member }
@@ -71,7 +79,7 @@ class MembersController < ApplicationController
end
end
- def finish_signup
+ def finish_signup
@member = current_member
if request.patch? && params[:member]
if @member.update(member_params)
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index cf50316a6..0f8d38d19 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -46,7 +46,6 @@ class NotificationsController < ApplicationController
@subject = @sender_notification.subject =~ /^Re: / ?
@sender_notification.subject :
"Re: " + @sender_notification.subject
-
respond_to do |format|
format.html # reply.html.haml
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index f6795bdef..e89f7577a 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -10,6 +10,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def facebook
create
end
+
def failure
flash[:alert] = "Authentication failed."
redirect_to request.env['omniauth.origin'] || "/"
@@ -27,7 +28,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
@authentication = action.establish_authentication(auth, member)
unless action.member_created?
- sign_in_and_redirect member, event: :authentication #this will throw if @user is not activated
+ sign_in_and_redirect member, event: :authentication # this will throw if @user is not activated
set_flash_message(:notice, :success, kind: auth['provider']) if is_navigational_format?
else
raise "Invalid provider" unless ['facebook', 'twitter', 'flickr'].index(auth['provider'].to_s)
@@ -48,4 +49,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
finish_signup_path(resource)
end
end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index 5de8e46e4..b0d744268 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -49,7 +49,6 @@ class OrdersController < ApplicationController
format.html { render action: "show" }
end
end
-
end
def complete
@@ -78,7 +77,6 @@ class OrdersController < ApplicationController
respond_to do |format|
format.html # new.html.erb
end
-
end
def cancel
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index 7a31ffddd..c14a02b40 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -1,7 +1,7 @@
class PasswordsController < Devise::PasswordsController
+ protected
-protected
def after_resetting_password_path_for(resource)
root_path
end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index d64419fcf..ba2d24cee 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,5 +1,5 @@
class PhotosController < ApplicationController
- before_filter :authenticate_member!, except: [:index, :show]
+ before_action :authenticate_member!, except: [:index, :show]
load_and_authorize_resource
# GET /photos
@@ -47,37 +47,12 @@ class PhotosController < ApplicationController
# POST /photos
# POST /photos.json
def create
- @photo = Photo.find_by_flickr_photo_id(params[:photo][:flickr_photo_id]) ||
- Photo.new(photo_params)
- @photo.owner_id = current_member.id
- @photo.set_flickr_metadata
-
-
- collection = case params[:type]
- when 'garden'
- @photo.gardens
- when 'planting'
- @photo.plantings
- when 'harvest'
- @photo.harvests
- else
- nil
- end
-
- if collection && has_item_id
- item = params[:type].camelcase.constantize.find_by_id(params[:id])
- if item && member_owns_item(item)
- collection << item unless collection.include?(item)
- else
- flash[:alert] = "Could not find this item owned by you"
- end
- else
- flash[:alert] = "Missing or invalid type or id parameter"
- end
+ find_or_create_photo_from_flickr_photo
+ add_photo_to_collection
respond_to do |format|
- if @photo.save
- format.html { redirect_to @photo, notice: 'Photo was successfully added.' }
+ if @photo.present? && @photo.save
+ format.html { redirect_to photo_path(@photo), notice: 'Photo was successfully added.' }
format.json { render json: @photo, status: :created, location: @photo }
else
format.html { render action: "new" }
@@ -108,7 +83,7 @@ class PhotosController < ApplicationController
@photo = Photo.find(params[:id])
@photo.destroy
flash[:alert] = "Photo successfully deleted."
-
+
respond_to do |format|
format.html { redirect_to photos_url }
format.json { head :no_content }
@@ -117,16 +92,57 @@ class PhotosController < ApplicationController
private
- def has_item_id
+ def item_id?
params.key? :id
end
- def member_owns_item(item)
- item.owner.id == current_member.id
+ def flickr_photo_id_param
+ params[:photo][:flickr_photo_id]
end
def photo_params
params.require(:photo).permit(:flickr_photo_id, :owner_id, :title, :license_name,
- :license_url, :thumbnail_url, :fullsize_url, :link_url)
+ :license_url, :thumbnail_url, :fullsize_url, :link_url)
+ end
+
+ def find_or_create_photo_from_flickr_photo
+ @photo = Photo.find_by(flickr_photo_id: flickr_photo_id_param)
+ @photo = Photo.new(photo_params) unless @photo
+ @photo.owner_id = current_member.id
+ @photo.set_flickr_metadata
+ @photo
+ end
+
+ def which_collection?
+ case params[:type]
+ when "garden" then @photo.gardens
+ when "harvest" then @photo.harvests
+ when "planting" then @photo.plantings
+ else raise "Invalid type"
+ end
+ end
+
+ def add_photo_to_collection
+ collection = which_collection?
+
+ unless collection && item_id?
+ flash[:alert] = "Missing or invalid type or id parameter"
+ return
+ end
+
+ item = find_item_for_photo!
+ collection << item unless collection.include?(item)
+ rescue
+ flash[:alert] = "Could not find this item owned by you"
+ end
+
+ def find_item_for_photo!
+ item_class = case params[:type]
+ when "garden" then Garden
+ when "harvest" then Harvest
+ when "planting" then Planting
+ else raise "Invalid type"
+ end
+ item_class.find_by!(id: params[:id], owner_id: current_member.id)
end
end
diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb
index 13c0bd05c..4982b1830 100644
--- a/app/controllers/places_controller.rb
+++ b/app/controllers/places_controller.rb
@@ -5,7 +5,11 @@ class PlacesController < ApplicationController
respond_to do |format|
format.html
# json response is whatever we want to map here
- format.json { render json: Member.located.to_json(only: [:id, :login_name, :slug, :location, :latitude, :longitude]) }
+ format.json do
+ render json: Member.located.to_json(only: [
+ :id, :login_name, :slug, :location, :latitude, :longitude
+ ])
+ end
end
end
@@ -16,7 +20,11 @@ class PlacesController < ApplicationController
@nearby_members = Member.nearest_to(params[:place])
respond_to do |format|
format.html # show.html.haml
- format.json { render json: @nearby_members.to_json(only: [:id, :login_name, :slug, :location, :latitude, :longitude]) }
+ format.json do
+ render json: @nearby_members.to_json(only: [
+ :id, :login_name, :slug, :location, :latitude, :longitude
+ ])
+ end
end
end
@@ -35,5 +43,4 @@ class PlacesController < ApplicationController
end
end
end
-
end
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 276024309..2c4589e40 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -7,18 +7,18 @@ class PlantingsController < ApplicationController
def index
@owner = Member.find_by_slug(params[:owner])
@crop = Crop.find_by_slug(params[:crop])
- if @owner
- @plantings = @owner.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
- elsif @crop
- @plantings = @crop.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
- else
- @plantings = Planting.includes(:owner, :crop, :garden).paginate(page: params[:page])
- end
+ @plantings = if @owner
+ @owner.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
+ elsif @crop
+ @crop.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
+ else
+ Planting.includes(:owner, :crop, :garden).paginate(page: params[:page])
+ end
respond_to do |format|
format.html { @plantings = @plantings.paginate(page: params[:page]) }
format.json { render json: @plantings }
- format.rss { render layout: false } #index.rss.builder
+ format.rss { render layout: false } # index.rss.builder
format.csv do
specifics = (@owner ? "#{@owner.login_name}-" : @crop ? "#{@crop.name}-" : nil)
@filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
@@ -71,7 +71,8 @@ class PlantingsController < ApplicationController
respond_to do |format|
if @planting.save
- @planting.update_attribute(:days_before_maturity, update_days_before_maturity(@planting, planting_params[:crop_id]))
+ @planting.update_attribute(:days_before_maturity,
+ update_days_before_maturity(@planting, planting_params[:crop_id]))
format.html { redirect_to @planting, notice: 'Planting was successfully created.' }
format.json { render json: @planting, status: :created, location: @planting }
expire_fragment("homepage_stats")
@@ -90,7 +91,8 @@ class PlantingsController < ApplicationController
respond_to do |format|
if @planting.update(planting_params)
- @planting.update_attribute(:days_before_maturity, update_days_before_maturity(@planting, planting_params[:crop_id]))
+ @planting.update_attribute(:days_before_maturity,
+ update_days_before_maturity(@planting, planting_params[:crop_id]))
format.html { redirect_to @planting, notice: 'Planting was successfully updated.' }
format.json { head :no_content }
else
@@ -118,8 +120,8 @@ class PlantingsController < ApplicationController
def planting_params
params.require(:planting).permit(:crop_id, :description, :garden_id, :planted_at,
- :quantity, :sunniness, :planted_from, :owner_id, :finished,
- :finished_at)
+ :quantity, :sunniness, :planted_from, :owner_id, :finished,
+ :finished_at)
end
def update_days_before_maturity(planting, crop_id)
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index e30ea1f7f..48216ac87 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -7,16 +7,16 @@ class PostsController < ApplicationController
def index
@author = Member.find_by_slug(params[:author])
- if @author
- @posts = @author.posts.includes(:author, { comments: :author }).paginate(page: params[:page])
- else
- @posts = Post.includes(:author, { comments: :author }).paginate(page: params[:page])
- end
+ @posts = if @author
+ @author.posts.includes(:author, { comments: :author }).paginate(page: params[:page])
+ else
+ Post.includes(:author, { comments: :author }).paginate(page: params[:page])
+ end
respond_to do |format|
format.html # index.html.haml
format.json { render json: @posts }
- format.rss { render layout: false } #index.rss.builder
+ format.rss { render layout: false } # index.rss.builder
end
end
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb
index 1ed69703f..be3e923dd 100644
--- a/app/controllers/products_controller.rb
+++ b/app/controllers/products_controller.rb
@@ -74,6 +74,6 @@ class ProductsController < ApplicationController
def product_params
params.require(:product).permit(:description, :min_price, :recommended_price, :name,
- :account_type_id, :paid_months)
+ :account_type_id, :paid_months)
end
end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index f251983eb..98651eb00 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -8,23 +8,22 @@ class RegistrationsController < Devise::RegistrationsController
render "edit"
end
-# we need this subclassed method so that Devise doesn't force people to
-# change their password every time they want to edit their settings.
-# we also check that they give their current password to change their password.
-# Code copied from
-# https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-edit-their-account-without-providing-a-password
+ # we need this subclassed method so that Devise doesn't force people to
+ # change their password every time they want to edit their settings.
+ # we also check that they give their current password to change their password.
+ # Code copied from
+ # https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-edit-their-account-without-providing-a-password
def update
-
@member = Member.find(current_member.id)
- successfully_updated = if needs_password?(@member, params)
- @member.update_with_password(devise_parameter_sanitizer.sanitize(:account_update))
+ if needs_password?(@member, params)
+ successfully_updated = @member.update_with_password(devise_parameter_sanitizer.sanitize(:account_update))
else
# remove the virtual current_password attribute
# update_without_password doesn't know how to ignore it
params[:member].delete(:current_password)
- @member.update_without_password(devise_parameter_sanitizer.sanitize(:account_update))
+ successfully_updated = @member.update_without_password(devise_parameter_sanitizer.sanitize(:account_update))
end
if successfully_updated
@@ -35,12 +34,11 @@ class RegistrationsController < Devise::RegistrationsController
else
render "edit"
end
-
end
end
# check if we need the current password to update fields
def needs_password?(member, params)
params[:member][:password].present? ||
- params[:member][:password_confirmation].present?
+ params[:member][:password_confirmation].present?
end
diff --git a/app/controllers/robots_controller.rb b/app/controllers/robots_controller.rb
index 090e0e031..d74ffe20f 100644
--- a/app/controllers/robots_controller.rb
+++ b/app/controllers/robots_controller.rb
@@ -1,14 +1,9 @@
class RobotsController < ApplicationController
-
DEFAULT_FILENAME = 'config/robots.txt'.freeze
def robots
- filename = if subdomain && subdomain != 'www'
- "config/robots.#{ subdomain }.txt"
- end
-
+ filename = "config/robots.#{subdomain}.txt" if subdomain && subdomain != 'www'
file_to_render = File.exists?(filename.to_s) ? filename : DEFAULT_FILENAME
-
render file: file_to_render, layout: false, content_type: 'text/plain'
end
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index c932d75ae..82b554467 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,7 +1,7 @@
class RolesController < ApplicationController
before_filter :authenticate_member!
load_and_authorize_resource
-
+
# GET /roles
def index
@roles = Role.all
diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb
index 70f3936a1..188855f45 100644
--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -7,18 +7,18 @@ class SeedsController < ApplicationController
def index
@owner = Member.find_by_slug(params[:owner])
@crop = Crop.find_by_slug(params[:crop])
- if @owner
- @seeds = @owner.seeds.includes(:owner, :crop).paginate(page: params[:page])
- elsif @crop
- @seeds = @crop.seeds.includes(:owner, :crop).paginate(page: params[:page])
- else
- @seeds = Seed.includes(:owner, :crop).paginate(page: params[:page])
- end
+ @seeds = if @owner
+ @owner.seeds.includes(:owner, :crop).paginate(page: params[:page])
+ elsif @crop
+ @crop.seeds.includes(:owner, :crop).paginate(page: params[:page])
+ else
+ Seed.includes(:owner, :crop).paginate(page: params[:page])
+ end
respond_to do |format|
format.html # index.html.erb
format.json { render json: @seeds }
- format.rss { render layout: false } #index.rss.builder
+ format.rss { render layout: false } # index.rss.builder
format.csv do
if @owner
@filename = "Growstuff-#{@owner}-Seeds-#{Time.zone.now.to_s(:number)}.csv"
@@ -49,7 +49,7 @@ class SeedsController < ApplicationController
@seed = Seed.new
# using find_by_id here because it returns nil, unlike find
- @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
+ @crop = Crop.find_by_id(params[:crop_id]) || Crop.new
respond_to do |format|
format.html # new.html.erb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3508c4d0d..0aa552bdf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,4 @@
module ApplicationHelper
-
def price_in_dollars(price)
return sprintf('%.2f', price / 100.0)
end
@@ -7,7 +6,7 @@ module ApplicationHelper
# 999 cents becomes 9.99 AUD -- for products/orders/etc
def price_with_currency(price)
return sprintf('%.2f %s', price / 100.0,
- Growstuff::Application.config.currency)
+ Growstuff::Application.config.currency)
end
def parse_date(str)
@@ -26,20 +25,20 @@ module ApplicationHelper
def build_alert_classes(alert_type = :info)
classes = 'alert alert-dismissable '
case alert_type.to_sym
- when :alert, :danger, :error, :validation_errors
- classes += 'alert-danger'
- when :warning, :todo
- classes += 'alert-warning'
- when :notice, :success
- classes += 'alert-success'
- when :info
- classes += 'alert-info'
+ when :alert, :danger, :error, :validation_errors
+ classes += 'alert-danger'
+ when :warning, :todo
+ classes += 'alert-warning'
+ when :notice, :success
+ classes += 'alert-success'
+ when :info
+ classes += 'alert-info'
end
classes
end
# Produces a cache key for uniquely identifying cached fragments.
- def cache_key_for(klass, identifier="all")
+ def cache_key_for(klass, identifier = "all")
count = klass.count
max_updated_at = klass.maximum(:updated_at).try(:utc).try(:to_s, :number)
"#{klass.name.downcase.pluralize}/#{identifier}-#{count}-#{max_updated_at}"
@@ -73,9 +72,9 @@ module ApplicationHelper
end
Gravatar.new(member.email).image_url({
- size: size,
- default: :identicon
- })
+ size: size,
+ default: :identicon
+ })
end
# Returns a string with the quantity and the right pluralization for a
@@ -86,4 +85,3 @@ module ApplicationHelper
"#{size} #{model_name}"
end
end
-
diff --git a/app/helpers/auto_suggest_helper.rb b/app/helpers/auto_suggest_helper.rb
index f7722c59c..a8a86de56 100644
--- a/app/helpers/auto_suggest_helper.rb
+++ b/app/helpers/auto_suggest_helper.rb
@@ -1,6 +1,5 @@
module AutoSuggestHelper
-
- def auto_suggest(resource, source, options={})
+ def auto_suggest(resource, source, options = {})
if options[:default] && !options[:default].new_record?
default = options[:default]
default_id = options[:default].try(:id)
@@ -13,10 +12,14 @@ module AutoSuggestHelper
source_path = Rails.application.routes.url_helpers.send("#{source}s_search_path")
%Q{
-
-
-
+
+
+
}.html_safe
end
-
end
diff --git a/app/helpers/crops_helper.rb b/app/helpers/crops_helper.rb
index 512efce8d..da3f72f10 100644
--- a/app/helpers/crops_helper.rb
+++ b/app/helpers/crops_helper.rb
@@ -2,7 +2,7 @@ module CropsHelper
def display_seed_availability(member, crop)
total_quantity = 0
- seeds = member.seeds.select {|seed| seed.crop.name == crop.name }
+ seeds = member.seeds.select { |seed| seed.crop.name == crop.name }
seeds.each do |seed|
total_quantity = total_quantity + seed.quantity if seed.quantity
diff --git a/app/helpers/gardens_helper.rb b/app/helpers/gardens_helper.rb
index 57f0c7bc6..5d1895e8f 100644
--- a/app/helpers/gardens_helper.rb
+++ b/app/helpers/gardens_helper.rb
@@ -1,10 +1,11 @@
module GardensHelper
-
def display_garden_description(garden)
if garden.description.nil?
"no description provided."
else
- truncate(garden.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", garden_path(garden) }
+ truncate(garden.description, length: 130, separator: ' ', omission: '... ') do
+ link_to "Read more", garden_path(garden)
+ end
end
end
diff --git a/app/helpers/harvests_helper.rb b/app/helpers/harvests_helper.rb
index b5f695a9d..d848d919f 100644
--- a/app/helpers/harvests_helper.rb
+++ b/app/helpers/harvests_helper.rb
@@ -1,5 +1,4 @@
module HarvestsHelper
-
def display_quantity(harvest)
human_quantity = display_human_quantity(harvest)
weight = display_weight(harvest)
@@ -16,10 +15,10 @@ module HarvestsHelper
end
def display_human_quantity(harvest)
- if ! harvest.quantity.blank? && harvest.quantity > 0
+ if !harvest.quantity.blank? && harvest.quantity > 0
if harvest.unit == 'individual' # just the number
number_to_human(harvest.quantity, strip_insignificant_zeros: true)
- elsif ! harvest.unit.blank? # pluralize anything else
+ elsif !harvest.unit.blank? # pluralize anything else
return pluralize(number_to_human(harvest.quantity, strip_insignificant_zeros: true), harvest.unit)
else
return "#{number_to_human(harvest.quantity, strip_insignificant_zeros: true)} #{harvest.unit}"
@@ -30,7 +29,7 @@ module HarvestsHelper
end
def display_weight(harvest)
- if ! harvest.weight_quantity.blank? && harvest.weight_quantity > 0
+ if !harvest.weight_quantity.blank? && harvest.weight_quantity > 0
return "#{number_to_human(harvest.weight_quantity, strip_insignificant_zeros: true)} #{harvest.weight_unit}"
else
return nil
@@ -44,5 +43,4 @@ module HarvestsHelper
harvest.description
end
end
-
end
diff --git a/app/helpers/plantings_helper.rb b/app/helpers/plantings_helper.rb
index fb6e2e7dc..e237ae27d 100644
--- a/app/helpers/plantings_helper.rb
+++ b/app/helpers/plantings_helper.rb
@@ -1,5 +1,4 @@
module PlantingsHelper
-
def display_days_before_maturity(planting)
if planting.finished?
0
@@ -41,5 +40,4 @@ module PlantingsHelper
return "#{planting.owner}."
end
end
-
end
diff --git a/app/helpers/seeds_helper.rb b/app/helpers/seeds_helper.rb
index 2d4f5a299..f0bc76dd9 100644
--- a/app/helpers/seeds_helper.rb
+++ b/app/helpers/seeds_helper.rb
@@ -1,11 +1,9 @@
module SeedsHelper
-
def display_seed_description(seed)
- if seed.description.nil?
- "no description provided."
+ if seed.description.nil?
+ "no description provided."
else
- truncate(seed.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", seed_path(seed) }
+ truncate(seed.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", seed_path(seed) }
end
end
-
-end
\ No newline at end of file
+end
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index e16c4a5fb..281f0b6ee 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -3,7 +3,10 @@ class Notifier < ActionMailer::Base
default from: "Growstuff "
def verifier
- raise "RAILS_SECRET_TOKEN environment variable not set - have you created config/application.yml?" unless ENV['RAILS_SECRET_TOKEN']
+ unless ENV['RAILS_SECRET_TOKEN']
+ raise "RAILS_SECRET_TOKEN environment variable"\
+ "not set - have you created config/application.yml?"
+ end
return ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
end
@@ -12,7 +15,7 @@ class Notifier < ActionMailer::Base
@notification = notification
@reply_link = reply_link(@notification)
- # Encrypting
+ # Encrypting
@signed_message = verifier.generate ({ member_id: @notification.recipient.id, type: :send_notification_email })
mail(to: @notification.recipient.email,
@@ -25,18 +28,18 @@ class Notifier < ActionMailer::Base
@plantings = @member.plantings.first(5)
@harvests = @member.harvests.first(5)
- # Encrypting
+ # Encrypting
@signed_message = verifier.generate ({ member_id: @member.id, type: :send_planting_reminder })
if @member.send_planting_reminder
mail(to: @member.email,
- subject: "What have you planted lately?")
+ subject: "What have you planted lately?")
end
end
def new_crop_request(member, request)
@member, @request = member, request
- mail(to: @member.email, subject: "#{@request.requester.login_name} has requested #{@request.name} as a new crop")
+ mail(to: @member.email, subject: "#{@request.requester.login_name} has requested #{@request.name} as a new crop")
end
def crop_request_approved(member, crop)
@@ -48,5 +51,4 @@ class Notifier < ActionMailer::Base
@member, @crop = member, crop
mail(to: @member.email, subject: "#{crop.name.capitalize} has been rejected")
end
-
end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 96b4ea69e..4ce056438 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -22,7 +22,7 @@ class Ability
cannot :read, AccountType
# nobody should be able to view unapproved crops unless they
- # are wranglers or admins
+ # are wranglers or admins
cannot :read, Crop
can :read, Crop, approval_status: "approved"
# scientific names should only be viewable if associated crop is approved
@@ -108,7 +108,7 @@ class Ability
can :cancel, Order, member_id: member.id, completed_at: nil
can :destroy, Order, member_id: member.id, completed_at: nil
- can :create, OrderItem
+ can :create, OrderItem
# for now, let's not let people mess with individual order items
cannot :read, OrderItem, order: { member_id: member.id }
cannot :update, OrderItem, order: { member_id: member.id, completed_at: nil }
diff --git a/app/models/account.rb b/app/models/account.rb
index bfbf60e5d..449697e05 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -8,7 +8,7 @@ class Account < ActiveRecord::Base
before_create do |account|
unless account.account_type
- account.account_type = AccountType.find_or_create_by(name:
+ account.account_type = AccountType.find_or_create_by(name:
Growstuff::Application.config.default_account_type
)
end
@@ -21,5 +21,4 @@ class Account < ActiveRecord::Base
return paid_until.to_s
end
end
-
end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index e649eb2b4..c1a49a2bb 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -19,5 +19,4 @@ class Comment < ActiveRecord::Base
)
end
end
-
end
diff --git a/app/models/crop.rb b/app/models/crop.rb
index 02acbdcf7..7cf02115c 100644
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -1,4 +1,4 @@
-class Crop < ActiveRecord::Base
+class Crop < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
extend FriendlyId
friendly_id :name, use: [:slugged, :finders]
@@ -19,13 +19,22 @@ class Crop < ActiveRecord::Base
belongs_to :parent, class_name: 'Crop'
has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
has_and_belongs_to_many :posts
- before_destroy {|crop| crop.posts.clear}
+ before_destroy { |crop| crop.posts.clear }
default_scope { order("lower(name) asc") }
- scope :recent, -> { where(approval_status: "approved").reorder("created_at desc") }
- scope :toplevel, -> { where(approval_status: "approved", parent_id: nil) }
- scope :popular, -> { where(approval_status: "approved").reorder("plantings_count desc, lower(name) asc") }
- scope :randomized, -> { where(approval_status: "approved").reorder('random()') } # ok on sqlite and psql, but not on mysql
+ scope :recent, lambda {
+ where(approval_status: "approved").reorder("created_at desc")
+ }
+ scope :toplevel, lambda {
+ where(approval_status: "approved", parent_id: nil)
+ }
+ scope :popular, lambda {
+ where(approval_status: "approved").reorder("plantings_count desc, lower(name) asc")
+ }
+ scope :randomized, lambda {
+ # ok on sqlite and psql, but not on mysql
+ where(approval_status: "approved").reorder('random()')
+ }
scope :pending_approval, -> { where(approval_status: "pending") }
scope :approved, -> { where(approval_status: "approved") }
scope :rejected, -> { where(approval_status: "rejected") }
@@ -33,7 +42,7 @@ class Crop < ActiveRecord::Base
## Wikipedia urls are only necessary when approving a crop
validates :en_wikipedia_url,
format: {
- with: /\Ahttps?:\/\/en\.wikipedia\.org\/wiki/,
+ with: /\Ahttps?:\/\/en\.wikipedia\.org\/wiki\/[[:alnum:]%_]+\z/,
message: 'is not a valid English Wikipedia URL'
},
if: :approved?
@@ -57,24 +66,24 @@ class Crop < ActiveRecord::Base
# use Rails.env as a part of index name (eg. development_growstuff)
index_name [Rails.env, "growstuff"].join('_')
settings index: { number_of_shards: 1 },
- analysis: {
- tokenizer: {
- gs_edgeNGram_tokenizer: {
- type: "edgeNGram", # edgeNGram: NGram match from the start of a token
- min_gram: 3,
- max_gram: 10,
- # token_chars: Elasticsearch will split on characters
- # that don’t belong to any of these classes
- token_chars: [ "letter", "digit" ]
- }
- },
- analyzer: {
- gs_edgeNGram_analyzer: {
- tokenizer: "gs_edgeNGram_tokenizer",
- filter: ["lowercase"]
- }
- },
- } do
+ analysis: {
+ tokenizer: {
+ gs_edgeNGram_tokenizer: {
+ type: "edgeNGram", # edgeNGram: NGram match from the start of a token
+ min_gram: 3,
+ max_gram: 10,
+ # token_chars: Elasticsearch will split on characters
+ # that don’t belong to any of these classes
+ token_chars: ["letter", "digit"]
+ }
+ },
+ analyzer: {
+ gs_edgeNGram_analyzer: {
+ tokenizer: "gs_edgeNGram_tokenizer",
+ filter: ["lowercase"]
+ }
+ },
+ } do
mappings dynamic: 'false' do
indexes :id, type: 'long'
indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
@@ -94,13 +103,13 @@ class Crop < ActiveRecord::Base
end
end
- def as_indexed_json(options={})
+ def as_indexed_json(options = {})
self.as_json(
only: [:id, :name, :approval_status],
include: {
scientific_names: { only: :scientific_name },
alternate_names: { only: :name }
- })
+ })
end
# update the Elasticsearch index (only if we're using it in this
@@ -143,13 +152,7 @@ class Crop < ActiveRecord::Base
# key: sunniness (eg. 'sun')
# value: count of how many times it's been used by plantings
def sunniness
- sunniness = Hash.new(0)
- plantings.each do |p|
- if !p.sunniness.blank?
- sunniness[p.sunniness] += 1
- end
- end
- return sunniness
+ count_uses_of_property 'sunniness'
end
# crop.planted_from
@@ -157,13 +160,7 @@ class Crop < ActiveRecord::Base
# key: propagation method (eg. 'seed')
# value: count of how many times it's been used by plantings
def planted_from
- planted_from = Hash.new(0)
- plantings.each do |p|
- if !p.planted_from.blank?
- planted_from[p.planted_from] += 1
- end
- end
- return planted_from
+ count_uses_of_property 'planted_from'
end
# crop.popular_plant_parts
@@ -201,18 +198,18 @@ class Crop < ActiveRecord::Base
end
def approval_statuses
- [ 'rejected', 'pending', 'approved' ]
+ ['rejected', 'pending', 'approved']
end
def reasons_for_rejection
- [ "already in database", "not edible", "not enough information", "other" ]
+ ["already in database", "not edible", "not enough information", "other"]
end
# Crop.interesting
# returns a list of interesting crops, for use on the homepage etc
def Crop.interesting
- howmany = 12 # max number to find
- interesting_crops = []
+ howmany = 12 # max number to find
+ interesting_crops = []
Crop.includes(:photos).randomized.each do |c|
break if interesting_crops.size == howmany
next unless c.interesting?
@@ -221,16 +218,16 @@ class Crop < ActiveRecord::Base
return interesting_crops
end
-# Crop.create_from_csv(row)
-# used by db/seeds.rb and rake growstuff:import_crops
-# CSV fields:
-# - name (required)
-# - en_wikipedia_url (required)
-# - parent (name, optional)
-# - scientific name (optional, can be picked up from parent if it has one)
+ # Crop.create_from_csv(row)
+ # used by db/seeds.rb and rake growstuff:import_crops
+ # CSV fields:
+ # - name (required)
+ # - en_wikipedia_url (required)
+ # - parent (name, optional)
+ # - scientific name (optional, can be picked up from parent if it has one)
def Crop.create_from_csv(row)
- name,en_wikipedia_url,parent,scientific_names,alternate_names = row
+ name, en_wikipedia_url, parent, scientific_names, alternate_names = row
cropbot = Member.find_by_login_name('cropbot')
raise "cropbot account not found: run rake db:seed" unless cropbot
@@ -252,56 +249,37 @@ class Crop < ActiveRecord::Base
crop.add_scientific_names_from_csv(scientific_names)
crop.add_alternate_names_from_csv(alternate_names)
-
end
def add_scientific_names_from_csv(scientific_names)
names_to_add = []
- if ! scientific_names.blank? # i.e. we actually passed something in, which isn't a given
+ if !scientific_names.blank? # i.e. we actually passed something in, which isn't a given
names_to_add = scientific_names.split(%r{,\s*})
elsif parent && parent.scientific_names.size > 0 # pick up from parent
- names_to_add = parent.scientific_names.map{|s| s.scientific_name}
+ names_to_add = parent.scientific_names.map { |s| s.scientific_name }
else
logger.warn("Warning: no scientific name (not even on parent crop) for #{self}")
end
+ cropbot = Member.find_by_login_name('cropbot')
+
if names_to_add.size > 0
- cropbot = Member.find_by_login_name('cropbot')
raise "cropbot account not found: run rake db:seed" unless cropbot
- names_to_add.each do |n|
- if self.scientific_names.exists?(scientific_name: n)
- logger.warn("Warning: skipping duplicate scientific name #{n} for #{self}")
- else
-
- self.scientific_names.create(
- scientific_name: n,
- creator_id: cropbot.id
- )
- end
- end
+ add_names_to_list(names_to_add, 'scientific', 'scientific_name')
end
end
def add_alternate_names_from_csv(alternate_names)
+ cropbot = Member.find_by_login_name('cropbot')
+
names_to_add = []
- if ! alternate_names.blank? # i.e. we actually passed something in, which isn't a given
- cropbot = Member.find_by_login_name('cropbot')
+
+ if !alternate_names.blank? # i.e. we actually passed something in, which isn't a given
raise "cropbot account not found: run rake db:seed" unless cropbot
names_to_add = alternate_names.split(%r{,\s*})
-
- names_to_add.each do |n|
- if self.alternate_names.exists?(name: n)
- logger.warn("Warning: skipping duplicate alternate name #{n} for #{self}")
- else
- self.alternate_names.create(
- name: n,
- creator_id: cropbot.id
- )
- end
- end
-
+ add_names_to_list(names_to_add, 'alternate', 'name')
end
end
@@ -317,21 +295,23 @@ class Crop < ActiveRecord::Base
def self.search(query)
if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
search_str = query.nil? ? "" : query.downcase
- response = __elasticsearch__.search( {
- # Finds documents which match any field, but uses the _score from
- # the best field insead of adding up _score from each field.
- query: {
- multi_match: {
- query: "#{search_str}",
- analyzer: "standard",
- fields: ["name", "scientific_names.scientific_name", "alternate_names.name"]
- }
- },
- filter: {
- term: {approval_status: "approved"}
- },
- size: 50
- }
+ response = __elasticsearch__.search({
+ # Finds documents which match any field, but uses the _score from
+ # the best field insead of adding up _score from each field.
+ query: {
+ multi_match: {
+ query: "#{search_str}",
+ analyzer: "standard",
+ fields: ["name",
+ "scientific_names.scientific_name",
+ "alternate_names.name"]
+ }
+ },
+ filter: {
+ term: { approval_status: "approved" }
+ },
+ size: 50
+ }
)
return response.records.to_a
else
@@ -354,6 +334,40 @@ class Crop < ActiveRecord::Base
end
end
+ private
+
+ def add_names_to_list(names_to_add, list_name, col_name)
+ names_to_add.each do |n|
+ if name_already_exists(list_name, col_name, n)
+ logger.warn("Warning: skipping duplicate #{list_name} name #{n} for #{self}")
+ else
+ create_crop_in_list(list_name, col_name, n)
+ end
+ end
+ end
+
+ def create_crop_in_list(list_name, col_name, name)
+ cropbot = Member.find_by_login_name('cropbot')
+ create_hash = {}
+ create_hash['creator_id'] = "#{cropbot.id}"
+ create_hash["#{col_name}"] = name
+ self.send("#{list_name}_names").create(create_hash)
+ end
+
+ def name_already_exists(list_name, col_name, name)
+ self.send("#{list_name}_names").exists?(["#{col_name} LIKE ?", name])
+ end
+
+ def count_uses_of_property(col_name)
+ data = Hash.new(0)
+ plantings.each do |p|
+ if !p.send("#{col_name}").blank?
+ data[p.send("#{col_name}")] += 1
+ end
+ end
+ data
+ end
+
# Custom validations
def approval_status_cannot_be_changed_again
@@ -376,5 +390,4 @@ class Crop < ActiveRecord::Base
errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
end
end
-
end
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 997352ebf..733c4fb43 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -11,6 +11,4 @@ class Follow < ActiveRecord::Base
body: "#{self.follower.login_name} just followed you on #{ENV["GROWSTUFF_SITE_NAME"]}. "
)
end
-
-
end
diff --git a/app/models/forum.rb b/app/models/forum.rb
index 0e2e2615d..810653d7c 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -8,5 +8,4 @@ class Forum < ActiveRecord::Base
def to_s
return name
end
-
end
diff --git a/app/models/garden.rb b/app/models/garden.rb
index 448d7d60e..ec4aea94f 100644
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -9,14 +9,14 @@ class Garden < ActiveRecord::Base
has_and_belongs_to_many :photos
- before_destroy do |garden|
- photolist = garden.photos.to_a # save a temp copy of the photo list
- garden.photos.clear # clear relationship b/w garden and photo
+ before_destroy do |garden|
+ photolist = garden.photos.to_a # save a temp copy of the photo list
+ garden.photos.clear # clear relationship b/w garden and photo
- photolist.each do |photo|
- photo.destroy_if_unused
- end
- end
+ photolist.each do |photo|
+ photo.destroy_if_unused
+ end
+ end
# set up geocoding
geocoded_by :location
@@ -33,7 +33,7 @@ class Garden < ActiveRecord::Base
validates :name,
format: {
- with: /\S/
+ with: /\A\w+[\w ]+\z/
},
length: { maximum: 255 }
@@ -50,9 +50,9 @@ class Garden < ActiveRecord::Base
"acres" => "acre"
}
validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
- message: "%{value} is not a valid area unit" },
- allow_nil: true,
- allow_blank: true
+ message: "%{value} is not a valid area unit" },
+ allow_nil: true,
+ allow_blank: true
after_validation :cleanup_area
@@ -76,7 +76,7 @@ class Garden < ActiveRecord::Base
seen_crops = []
plantings.each do |p|
- if (! seen_crops.include?(p.crop))
+ if (!seen_crops.include?(p.crop))
unique_plantings.push(p)
seen_crops.push(p.crop)
end
@@ -103,5 +103,4 @@ class Garden < ActiveRecord::Base
def default_photo
return photos.first
end
-
end
diff --git a/app/models/harvest.rb b/app/models/harvest.rb
index 39a176a45..04f4608f2 100644
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -22,9 +22,9 @@ class Harvest < ActiveRecord::Base
validates :crop, approved: true
- validates :crop, presence: {message: "must be present and exist in our database"}
+ validates :crop, presence: { message: "must be present and exist in our database" }
- validates :plant_part, presence: {message: "must be present and exist in our database"}
+ validates :plant_part, presence: { message: "must be present and exist in our database" }
validates :quantity,
numericality: {
@@ -45,9 +45,9 @@ class Harvest < ActiveRecord::Base
"bushels" => "bushel"
}
validates :unit, inclusion: { in: UNITS_VALUES.values,
- message: "%{value} is not a valid unit" },
- allow_nil: true,
- allow_blank: true
+ message: "%{value} is not a valid unit" },
+ allow_nil: true,
+ allow_blank: true
validates :weight_quantity,
numericality: { only_integer: false },
@@ -59,15 +59,15 @@ class Harvest < ActiveRecord::Base
"oz" => "oz"
}
validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
- message: "%{value} is not a valid unit" },
- allow_nil: true,
- allow_blank: true
+ message: "%{value} is not a valid unit" },
+ allow_nil: true,
+ allow_blank: true
after_validation :cleanup_quantities
before_save :set_si_weight
- # we're storing the harvest weight in kilograms in the db too
+ # we're storing the harvest weight in kilograms in the db too
# to make data manipulation easier
def set_si_weight
if self.weight_unit != nil
@@ -105,27 +105,26 @@ class Harvest < ActiveRecord::Base
string = ''
if self.quantity
string += "#{number_to_human(self.quantity.to_s, strip_insignificant_zeros: true)} "
- if self.unit == 'individual'
- string += 'individual '
- else
- if self.quantity == 1
- string += "#{self.unit} of "
- else
- string += "#{self.unit.pluralize} of "
- end
- end
+ string += if self.unit == 'individual'
+ 'individual '
+ elsif self.quantity == 1
+ "#{self.unit} of "
+ else
+ "#{self.unit.pluralize} of "
+ end
end
- if self.unit != 'individual' # buckets of apricot*s*
- string += "#{self.crop.name.pluralize}"
- elsif self.quantity == 1
- string += "#{self.crop.name}"
- else
- string += "#{self.crop.name.pluralize}"
- end
+ string += if self.unit != 'individual' # buckets of apricot*s*
+ "#{self.crop.name.pluralize}"
+ elsif self.quantity == 1
+ "#{self.crop.name}"
+ else
+ "#{self.crop.name.pluralize}"
+ end
if self.weight_quantity
- string += " weighing #{number_to_human(self.weight_quantity, strip_insignificant_zeros: true)} #{self.weight_unit}"
+ string += " weighing #{number_to_human(self.weight_quantity, strip_insignificant_zeros: true)}"\
+ " #{self.weight_unit}"
end
return string
@@ -134,5 +133,4 @@ class Harvest < ActiveRecord::Base
def default_photo
return photos.first || crop.default_photo
end
-
end
diff --git a/app/models/member.rb b/app/models/member.rb
index df1aa2d2a..018860365 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -4,7 +4,7 @@ class Member < ActiveRecord::Base
friendly_id :login_name, use: [:slugged, :finders]
- has_many :posts, foreign_key: 'author_id'
+ has_many :posts, foreign_key: 'author_id'
has_many :comments, foreign_key: 'author_id'
has_many :forums, foreign_key: 'owner_id'
@@ -27,7 +27,6 @@ class Member < ActiveRecord::Base
has_many :photos
-
default_scope { order("lower(login_name) asc") }
scope :confirmed, -> { where('confirmed_at IS NOT NULL') }
scope :located, -> { where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL") }
@@ -45,8 +44,8 @@ class Member < ActiveRecord::Base
# :token_authenticatable, :confirmable,
# :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
- :recoverable, :rememberable, :trackable, :validatable,
- :confirmable, :lockable, :timeoutable, :omniauthable
+ :recoverable, :rememberable, :trackable, :validatable,
+ :confirmable, :lockable, :timeoutable, :omniauthable
# set up geocoding
geocoded_by :location
@@ -59,7 +58,7 @@ class Member < ActiveRecord::Base
# Requires acceptance of the Terms of Service
validates_acceptance_of :tos_agreement, allow_nil: true,
- accept: true
+ accept: true
validates :login_name,
length: {
@@ -80,12 +79,12 @@ class Member < ActiveRecord::Base
}
# Give each new member a default garden
- after_create {|member| Garden.create(name: "Garden", owner_id: member.id) }
+ after_create { |member| Garden.create(name: "Garden", owner_id: member.id) }
# and an account record (for paid accounts etc)
# we use find_or_create to avoid accidentally creating a second one,
# which can happen sometimes especially with FactoryGirl associations
- after_create {|member| Account.find_or_create_by(member_id: member.id) }
+ after_create { |member| Account.find_or_create_by(member_id: member.id) }
after_save :update_newsletter_subscription
@@ -159,21 +158,21 @@ class Member < ActiveRecord::Base
# Fetches a collection of photos from Flickr
# Returns a [[page of photos], total] pair.
# Total is needed for pagination.
- def flickr_photos(page_num=1, set=nil)
+ def flickr_photos(page_num = 1, set = nil)
result = false
- if set
- result = flickr.photosets.getPhotos(
- photoset_id: set,
- page: page_num,
- per_page: 30
- )
- else
- result = flickr.people.getPhotos(
- user_id: 'me',
- page: page_num,
- per_page: 30
- )
- end
+ result = if set
+ flickr.photosets.getPhotos(
+ photoset_id: set,
+ page: page_num,
+ per_page: 30
+ )
+ else
+ flickr.people.getPhotos(
+ user_id: 'me',
+ page: page_num,
+ per_page: 30
+ )
+ end
if result
return [result.photo, result.total]
else
@@ -183,7 +182,7 @@ class Member < ActiveRecord::Base
# Returns a hash of Flickr photosets' ids and titles
def flickr_sets
- sets = Hash.new
+ sets = Hash.new
flickr.photosets.getList.each do |p|
sets[p.title] = p.id
end
@@ -213,7 +212,7 @@ class Member < ActiveRecord::Base
def Member.nearest_to(place)
nearby_members = []
if place
- latitude, longitude = Geocoder.coordinates(place, params: {limit: 1})
+ latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
if latitude && longitude
nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) }
end
@@ -235,24 +234,24 @@ class Member < ActiveRecord::Base
end
end
- def newsletter_subscribe(testing=false)
+ def newsletter_subscribe(testing = false)
return true if (Rails.env.test? && !testing)
gb = Gibbon::API.new
res = gb.lists.subscribe({
- id: Growstuff::Application.config.newsletter_list_id,
- email: { email: email },
- merge_vars: { login_name: login_name },
- double_optin: false # they already confirmed their email with us
- })
+ id: Growstuff::Application.config.newsletter_list_id,
+ email: { email: email },
+ merge_vars: { login_name: login_name },
+ double_optin: false # they already confirmed their email with us
+ })
end
- def newsletter_unsubscribe(testing=false)
+ def newsletter_unsubscribe(testing = false)
return true if (Rails.env.test? && !testing)
gb = Gibbon::API.new
res = gb.lists.unsubscribe({
- id: Growstuff::Application.config.newsletter_list_id,
- email: { email: email }
- })
+ id: Growstuff::Application.config.newsletter_list_id,
+ email: { email: email }
+ })
end
def already_following?(member)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 9f9a61257..4be21e668 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -30,5 +30,4 @@ class Notification < ActiveRecord::Base
Notifier.notify(self).deliver_later
end
end
-
end
diff --git a/app/models/order.rb b/app/models/order.rb
index 00b0b712d..df074c5a9 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -21,7 +21,7 @@ class Order < ActiveRecord::Base
sum = 0
for i in order_items do
subtotal = i.price * i.quantity
- sum += subtotal
+ sum += subtotal
end
return sum
end
@@ -31,10 +31,10 @@ class Order < ActiveRecord::Base
items = []
order_items.each do |i|
items.push({
- name: i.product.name,
- quantity: i.quantity,
- amount: i.price
- })
+ name: i.product.name,
+ quantity: i.quantity,
+ amount: i.price
+ })
end
return items
end
@@ -66,35 +66,34 @@ class Order < ActiveRecord::Base
# search orders (used by admin/orders)
# usage: Order.search({ :by => 'member', :for => 'Skud' })
# can search by: member, order_id, paypal_token, paypal_payer_id,
- def Order.search(args={})
+ def Order.search(args = {})
if args[:for]
case args[:by]
- when "member"
- member = Member.find_by_login_name(args[:for])
- if member
- return member.orders
- end
- when "order_id"
- order = Order.find_by_id(args[:for])
- if order
- return [order]
- end
- when "paypal_token"
- order = Order.find_by_paypal_express_token(args[:for])
- if order
- return [order]
- end
- when "paypal_payer_id"
- order = Order.find_by_paypal_express_payer_id(args[:for])
- if order
- return [order]
- end
- when "referral_code"
- # coerce to uppercase
- return Order.where(referral_code: args[:for].upcase)
+ when "member"
+ member = Member.find_by_login_name(args[:for])
+ if member
+ return member.orders
+ end
+ when "order_id"
+ order = Order.find_by_id(args[:for])
+ if order
+ return [order]
+ end
+ when "paypal_token"
+ order = Order.find_by_paypal_express_token(args[:for])
+ if order
+ return [order]
+ end
+ when "paypal_payer_id"
+ order = Order.find_by_paypal_express_payer_id(args[:for])
+ if order
+ return [order]
+ end
+ when "referral_code"
+ # coerce to uppercase
+ return Order.where(referral_code: args[:for].upcase)
end
end
return []
end
-
end
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 1abef6047..6d7fdbcba 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -34,11 +34,9 @@ class Photo < ActiveRecord::Base
fullsize_url: FlickRaw.url_z(info),
link_url: FlickRaw.url_photopage(info)
}
-
end
def set_flickr_metadata
self.update_attributes(flickr_metadata)
end
-
end
diff --git a/app/models/plant_part.rb b/app/models/plant_part.rb
index 652bc894b..16f23822a 100644
--- a/app/models/plant_part.rb
+++ b/app/models/plant_part.rb
@@ -20,5 +20,4 @@ class PlantPart < ActiveRecord::Base
def crops
return super.reorder('name')
end
-
end
diff --git a/app/models/planting.rb b/app/models/planting.rb
index 7d048ca1d..8dc339687 100644
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -32,7 +32,7 @@ class Planting < ActiveRecord::Base
validates :crop, approved: true
- validates :crop, presence: {message: "must be present and exist in our database"}
+ validates :crop, presence: { message: "must be present and exist in our database" }
validates :quantity,
numericality: {
@@ -42,9 +42,9 @@ class Planting < ActiveRecord::Base
SUNNINESS_VALUES = %w(sun semi-shade shade)
validates :sunniness, inclusion: { in: SUNNINESS_VALUES,
- message: "%{value} is not a valid sunniness value" },
- allow_nil: true,
- allow_blank: true
+ message: "%{value} is not a valid sunniness value" },
+ allow_nil: true,
+ allow_blank: true
PLANTED_FROM_VALUES = [
'seed',
@@ -60,9 +60,9 @@ class Planting < ActiveRecord::Base
'layering'
]
validates :planted_from, inclusion: { in: PLANTED_FROM_VALUES,
- message: "%{value} is not a valid planting method" },
- allow_nil: true,
- allow_blank: true
+ message: "%{value} is not a valid planting method" },
+ allow_nil: true,
+ allow_blank: true
validate :finished_must_be_after_planted
@@ -104,8 +104,8 @@ class Planting < ActiveRecord::Base
if differences.compact.empty?
nil
- else
- differences.compact.sum/differences.compact.size
+ else
+ differences.compact.sum / differences.compact.size
end
end
@@ -120,7 +120,7 @@ class Planting < ActiveRecord::Base
return 0 if current_date < planted_at
return 100 if days > days_before_maturity
- percent = (days/days_before_maturity*100).to_i
+ percent = (days / days_before_maturity * 100).to_i
if percent >= 100
percent = 100
@@ -132,7 +132,7 @@ class Planting < ActiveRecord::Base
# return a list of interesting plantings, for the homepage etc.
# we can't do this via a scope (as far as we know) so sadly we have to
# do it this way.
- def Planting.interesting(howmany=12, require_photo=true)
+ def Planting.interesting(howmany = 12, require_photo = true)
interesting_plantings = []
seen_owners = Hash.new(false) # keep track of which owners we've seen already
diff --git a/app/models/post.rb b/app/models/post.rb
index 60d08f816..ed4bcad73 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -5,14 +5,14 @@ class Post < ActiveRecord::Base
belongs_to :forum
has_many :comments, dependent: :destroy
has_and_belongs_to_many :crops
- before_destroy {|post| post.crops.clear}
+ before_destroy { |post| post.crops.clear }
after_save :update_crops_posts_association
# also has_many notifications, but kinda meaningless to get at them
# from this direction, so we won't set up an association for now.
after_create do
recipients = []
- sender = self.author.id
+ sender = self.author.id
self.body.scan(Haml::Filters::GrowstuffMarkdown::MEMBER_REGEX) do |m|
# find member case-insensitively and add to list of recipients
member = Member.where('lower(login_name) = ?', $1.downcase).first
@@ -24,7 +24,7 @@ class Post < ActiveRecord::Base
recipients << member if member && !recipients.include?(member)
end
# don't send notifications to yourself
- recipients.map{ |r| r.id }.each do |recipient|
+ recipients.map { |r| r.id }.each do |recipient|
if recipient != sender
Notification.create(
recipient_id: recipient,
@@ -44,7 +44,6 @@ class Post < ActiveRecord::Base
},
length: { maximum: 255 }
-
def author_date_subject
# slugs are created before created_at is set
time = created_at || Time.zone.now
@@ -70,14 +69,15 @@ class Post < ActiveRecord::Base
end
private
- def update_crops_posts_association
- self.crops.destroy_all
- # look for crops mentioned in the post. eg. [tomato](crop)
- self.body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |m|
- # find crop case-insensitively
- crop = Crop.where('lower(name) = ?', $1.downcase).first
- # create association
- self.crops << crop if crop && !self.crops.include?(crop)
- end
+
+ def update_crops_posts_association
+ self.crops.destroy_all
+ # look for crops mentioned in the post. eg. [tomato](crop)
+ self.body.scan(Haml::Filters::GrowstuffMarkdown::CROP_REGEX) do |m|
+ # find crop case-insensitively
+ crop = Crop.where('lower(name) = ?', $1.downcase).first
+ # create association
+ self.crops << crop if crop && !self.crops.include?(crop)
end
+ end
end
diff --git a/app/models/product.rb b/app/models/product.rb
index 942e2603b..8cab945a7 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -11,5 +11,4 @@ class Product < ActiveRecord::Base
def to_s
name
end
-
end
diff --git a/app/models/seed.rb b/app/models/seed.rb
index 9592fb1c4..4c8a1c1c7 100644
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -9,7 +9,7 @@ class Seed < ActiveRecord::Base
validates :crop, approved: true
- validates :crop, presence: {message: "must be present and exist in our database"}
+ validates :crop, presence: { message: "must be present and exist in our database" }
validates :quantity,
numericality: {
only_integer: true,
@@ -30,9 +30,10 @@ class Seed < ActiveRecord::Base
TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally)
validates :tradable_to, inclusion: { in: TRADABLE_TO_VALUES,
- message: "You may only trade seed nowhere, locally, nationally, or internationally" },
- allow_nil: false,
- allow_blank: false
+ message: "You may only trade seed nowhere, "\
+ "locally, nationally, or internationally" },
+ allow_nil: false,
+ allow_blank: false
ORGANIC_VALUES = [
'certified organic',
@@ -40,9 +41,10 @@ class Seed < ActiveRecord::Base
'conventional/non-organic',
'unknown']
validates :organic, inclusion: { in: ORGANIC_VALUES,
- message: "You must say whether the seeds are organic or not, or that you don't know" },
- allow_nil: false,
- allow_blank: false
+ message: "You must say whether the seeds "\
+ "are organic or not, or that you don't know" },
+ allow_nil: false,
+ allow_blank: false
GMO_VALUES = [
'certified GMO-free',
@@ -50,15 +52,16 @@ class Seed < ActiveRecord::Base
'GMO',
'unknown']
validates :gmo, inclusion: { in: GMO_VALUES,
- message: "You must say whether the seeds are genetically modified or not, or that you don't know" },
- allow_nil: false,
- allow_blank: false
+ message: "You must say whether the seeds are "\
+ "genetically modified or not, or that you don't know" },
+ allow_nil: false,
+ allow_blank: false
HEIRLOOM_VALUES = %w(heirloom hybrid unknown)
validates :heirloom, inclusion: { in: HEIRLOOM_VALUES,
- message: "You must say whether the seeds are heirloom, hybrid, or unknown" },
- allow_nil: false,
- allow_blank: false
+ message: "You must say whether the seeds are heirloom, hybrid, or unknown" },
+ allow_nil: false,
+ allow_blank: false
def tradable?
if self.tradable_to == 'nowhere'
@@ -89,7 +92,6 @@ class Seed < ActiveRecord::Base
end
return interesting_seeds
-
end
def seed_slug
diff --git a/app/views/alternate_names/_form.html.haml b/app/views/alternate_names/_form.html.haml
index cb33660b5..3d3855e60 100644
--- a/app/views/alternate_names/_form.html.haml
+++ b/app/views/alternate_names/_form.html.haml
@@ -21,7 +21,7 @@
= f.label :name, :class => 'control-label col-md-2'
.col-md-8
= f.text_field :name, :class => 'form-control'
-
+
.form-group
.form-actions.col-md-offset-2.col-md-8
= f.submit 'Save', :class => 'btn btn-primary'
\ No newline at end of file
diff --git a/app/views/comments/show.html.haml b/app/views/comments/show.html.haml
index 84cd72159..fd92fd4c2 100644
--- a/app/views/comments/show.html.haml
+++ b/app/views/comments/show.html.haml
@@ -1,6 +1,6 @@
= content_for :title, @comment.post.subject
- content_for :opengraph do
- = tag("meta", property: "og:image", content: avatar_uri(@comment.post.author, 200))
+ = tag("meta", property: "og:image", content: avatar_uri(@comment.post.author, 200))
= tag("meta", property: "og:image:user_generated", content: "true")
= tag("meta", property: "og:title", content: @comment.post.subject)
= tag("meta", property: "og:description", content: strip_tags(@comment.post.body).split(' ')[0..20].join(' '))
diff --git a/app/views/crops/_form.html.haml b/app/views/crops/_form.html.haml
index 99fa8648e..830a84238 100644
--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -48,7 +48,7 @@
Scientific names
= button_tag "+", :id => "add-sci_name-row", :type => "button"
= button_tag "-", :id => "remove-sci_name-row", :type => "button"
-
+
.form-group#scientific_names
- @crop.scientific_names.each.with_index do |sci, index|
.template.col-md-12{ :id => "sci_template[#{index+1}]" }
@@ -64,7 +64,7 @@
= button_tag "+", :id => "add-alt_name-row", :type => "button"
= button_tag "-", :id => "remove-alt_name-row", :type => "button"
- .form-group#alternate_names
+ .form-group#alternate_names
- @crop.alternate_names.each.with_index do |alt, index|
.template.col-md-12{ :id => "alt_template[#{index+1}]" }
.col-md-2
diff --git a/app/views/crops/new.html.haml b/app/views/crops/new.html.haml
index f472c4791..bd4f6e613 100644
--- a/app/views/crops/new.html.haml
+++ b/app/views/crops/new.html.haml
@@ -1,7 +1,7 @@
-- content_for :title, (can?(:wrangle, @crop) ? "New crop" : "Suggest a crop")
+- content_for :title, (can?(:wrangle, @crop) ? "New crop" : "Suggest a crop")
- unless can? :wrangler, @crop
-
+
%p Thanks for taking the time to suggest a crop! Our crop database is managed by volunteers, and we appreciate your help. Here are some things to consider when suggesting a new crop:
%ul
diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml
index eb09ece6e..ec578db14 100644
--- a/app/views/crops/show.html.haml
+++ b/app/views/crops/show.html.haml
@@ -2,7 +2,7 @@
- content_for :subtitle, @crop.default_scientific_name
- content_for :opengraph do
- @crop.photos.each do |photo|
- = tag("meta", property: "og:image", content: photo.fullsize_url)
+ = tag("meta", property: "og:image", content: photo.fullsize_url)
= tag("meta", property: "og:title", content: @crop.name)
= tag("meta", property: "og:type", content: "website")
= tag("meta", property: "og:url", content: request.original_url)
@@ -92,9 +92,9 @@
%h4 Learn more about #{ @crop.name.pluralize }
%ul
%li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url, target: "_blank", rel: "noopener noreferrer"
- %li
+ %li
= link_to "OpenFarm - Growing guide", "https://openfarm.cc/en/crops/#{URI.escape @crop.name}", target: "_blank", rel: "noopener noreferrer"
- %li
+ %li
= link_to "Gardenate - Planting reminders", "http://www.gardenate.com/plant/#{URI.escape @crop.name}", target: "_blank", rel: "noopener noreferrer"
- if current_member && current_member.location
%li
diff --git a/app/views/crops/wrangle.html.haml b/app/views/crops/wrangle.html.haml
index 4c0448b01..6b983a7e1 100644
--- a/app/views/crops/wrangle.html.haml
+++ b/app/views/crops/wrangle.html.haml
@@ -24,7 +24,7 @@
%li{:class => @approval_status == "rejected" ? 'active' : ''}
= link_to "Rejected", wrangle_crops_path(:approval_status => "rejected")
-%h2
+%h2
- if @approval_status == "pending"
Requested Crops
- elsif @approval_status == "rejected"
diff --git a/app/views/forums/index.html.haml b/app/views/forums/index.html.haml
index 39b4f269d..69a3024ce 100644
--- a/app/views/forums/index.html.haml
+++ b/app/views/forums/index.html.haml
@@ -1,4 +1,4 @@
-- content_for :title, t('.title')
+- content_for :title, t('.title')
- if can? :create, Forum
%p
diff --git a/app/views/gardens/_thumbnail.html.haml b/app/views/gardens/_thumbnail.html.haml
index ef9209802..bc08be246 100644
--- a/app/views/gardens/_thumbnail.html.haml
+++ b/app/views/gardens/_thumbnail.html.haml
@@ -1,7 +1,7 @@
.panel.panel-success
.panel-heading
%h3.panel-title
- = link_to "#{garden.owner.login_name}'s garden", garden.owner
+ = link_to "#{garden.owner.login_name}'s garden", garden
- if can? :edit, garden
%a.pull-right{:href => edit_garden_path(garden), :role => "button", :id => "edit_garden_glyphicon"}
%span.glyphicon.glyphicon-pencil{:title => "Edit"}
@@ -11,17 +11,17 @@
= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => garden.name, :class => 'img'), garden
.col-md-8
%dl.dl-horizontal
- %dt Name :
+ %dt Name :
%dd= link_to garden.name, garden
- %dt Location :
+ %dt Location :
%dd
- if garden.location.blank?
not specified
- else
= link_to garden.location, place_path(garden.location, anchor: "gardens")
- %dt Area :
+ %dt Area :
%dd= garden.area.nil? ? "not specified" : pluralize(garden.area, garden.area_unit)
- %dt Active? :
+ %dt Active? :
%dd= garden.active ? "Yes" : "No"
.col-md-12
%b
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index 882f0dfde..146a66f00 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -40,8 +40,8 @@
%p No description available yet.
- if can? :edit, @garden
- %p
- Why not
+ %p
+ Why not
= link_to 'tell us more.', edit_garden_path(@garden)
- if @garden.photos.size > 0 or (can? :edit, @garden and can? :create, Photo)
diff --git a/app/views/harvests/_thumbnail.html.haml b/app/views/harvests/_thumbnail.html.haml
index 9af6003c1..0f908e642 100644
--- a/app/views/harvests/_thumbnail.html.haml
+++ b/app/views/harvests/_thumbnail.html.haml
@@ -11,13 +11,13 @@
= link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => harvest.crop.name, :class => 'img'), harvest.crop
.col-md-8
%dl.dl-horizontal
- %dt Crop :
+ %dt Crop :
%dd= link_to harvest.crop.name, harvest.crop
- %dt Plant part :
+ %dt Plant part :
%dd= link_to harvest.plant_part, harvest.plant_part
- %dt Quantity :
+ %dt Quantity :
%dd= display_quantity(harvest)
- %dt Harvest date :
+ %dt Harvest date :
%dd= harvest.harvested_at
.panel-footer
%dt Description
diff --git a/app/views/harvests/show.html.haml b/app/views/harvests/show.html.haml
index f4e6220d8..deb53d6e1 100644
--- a/app/views/harvests/show.html.haml
+++ b/app/views/harvests/show.html.haml
@@ -1,7 +1,7 @@
=content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
- content_for :opengraph do
- @harvest.photos.each do |photo|
- = tag("meta", property: "og:image", content: photo.fullsize_url)
+ = tag("meta", property: "og:image", content: photo.fullsize_url)
= tag("meta", property: "og:image:user_generated", content: "true")
= tag("meta", property: "og:title", content: "#{@harvest.crop} harvested by #{@harvest.owner}")
= tag("meta", property: "og:type", content: "website")
@@ -17,8 +17,8 @@
= link_to "view all #{@harvest.owner}'s harvests", harvests_by_owner_path(:owner => @harvest.owner.slug)
%p
%b Plant part:
- - if @harvest.plant_part
- = link_to @harvest.plant_part, @harvest.plant_part
+ - if @harvest.plant_part
+ = link_to @harvest.plant_part, @harvest.plant_part
- else
not specified
%p
diff --git a/app/views/home/_stats.html.haml b/app/views/home/_stats.html.haml
index 53ffd2492..ee334b86d 100644
--- a/app/views/home/_stats.html.haml
+++ b/app/views/home/_stats.html.haml
@@ -2,7 +2,7 @@
%p.stats
= t('.message_html', { member: link_to(t('.member_linktext', count: Member.confirmed.size.to_i), members_path),
number_crops: link_to(t('.number_crops_linktext', count: Crop.count.to_i), crops_path),
- number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path),
+ number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path),
number_gardens: link_to(t('.number_gardens_linktext', count: Garden.count.to_i), gardens_path) })
diff --git a/app/views/members/_gardens.html.haml b/app/views/members/_gardens.html.haml
index cfb5e22cb..6dfeaa1c8 100644
--- a/app/views/members/_gardens.html.haml
+++ b/app/views/members/_gardens.html.haml
@@ -7,7 +7,7 @@
- first_garden = false
= link_to g.name, "#garden#{g.id}", 'data-toggle' => 'tab'
- if current_member == member
- %li.navbar-right
+ %li.navbar-right
= link_to new_garden_path, class: 'btn' do
Add New Garden
.tab-content{style: "padding-top: 1em"}
@@ -25,8 +25,8 @@
%p No description available yet.
- if can? :edit, g
- %p
- Why not
+ %p
+ Why not
= link_to 'tell us more.', edit_garden_path(g)
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 334cd2d33..0e5a93c93 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -1,9 +1,9 @@
- content_for :title, @member.login_name
- content_for :subtitle, @member.location
- content_for :opengraph do
- = tag("meta", property: "og:image", content: avatar_uri(@member, 200))
- = tag("meta", property: "og:image:user_generated", content: "true")
- = tag("meta", property: "og:title", content: @member.login_name)
+ = tag("meta", property: "og:image", content: avatar_uri(@member, 200))
+ = tag("meta", property: "og:image:user_generated", content: "true")
+ = tag("meta", property: "og:title", content: @member.login_name)
= tag("meta", property: "og:type", content: "profile")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
diff --git a/app/views/members/view_followers.html.haml b/app/views/members/view_followers.html.haml
index 6600c737c..aeea18b8c 100644
--- a/app/views/members/view_followers.html.haml
+++ b/app/views/members/view_followers.html.haml
@@ -7,10 +7,10 @@
.row
.col-md-12
- @followers.each do |f|
- .col-md-4.three-across
- .thumbnail
+ .col-md-4.three-across
+ .thumbnail
= render :partial => "members/thumbnail", :locals => { :member => f }
-
+
%div.pagination
= page_entries_info @followers
= will_paginate @followers
diff --git a/app/views/members/view_follows.html.haml b/app/views/members/view_follows.html.haml
index cd0c522de..a5f293737 100644
--- a/app/views/members/view_follows.html.haml
+++ b/app/views/members/view_follows.html.haml
@@ -7,8 +7,8 @@
.row
.col-md-12
- @follows.each do |f|
- .col-md-4.three-across
- .thumbnail
+ .col-md-4.three-across
+ .thumbnail
= render :partial => "members/thumbnail", :locals => { :member => f }
%div.pagination
diff --git a/app/views/notifier/new_crop_request.html.haml b/app/views/notifier/new_crop_request.html.haml
index 0e8c65ab7..3c2959f10 100644
--- a/app/views/notifier/new_crop_request.html.haml
+++ b/app/views/notifier/new_crop_request.html.haml
@@ -2,7 +2,7 @@
%p Hello #{@member.login_name},
-%p
+%p
#{@request.requester.login_name} has requested a new crop on #{site_name}.
%ul
diff --git a/app/views/places/show.html.haml b/app/views/places/show.html.haml
index d37da8433..25564cf9c 100644
--- a/app/views/places/show.html.haml
+++ b/app/views/places/show.html.haml
@@ -1,6 +1,6 @@
-content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}"
- content_for :opengraph do
- = tag("meta", property: "og:title", content: "#{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}")
+ = tag("meta", property: "og:title", content: "#{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}")
= tag("meta", property: "og:type", content: "website")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
@@ -34,7 +34,7 @@
#plantings
%h3= "Recent plantings near #{@place}"
-
+
- plantings = []
- @nearby_members.first(10).each do |member|
diff --git a/app/views/plant_parts/show.html.haml b/app/views/plant_parts/show.html.haml
index c24cf6ea0..c2427059c 100644
--- a/app/views/plant_parts/show.html.haml
+++ b/app/views/plant_parts/show.html.haml
@@ -1,6 +1,6 @@
- content_for :title, @plant_part.name.titlecase
- content_for :opengraph do
- = tag("meta", property: "og:title", content: @plant_part.name.titlecase)
+ = tag("meta", property: "og:title", content: @plant_part.name.titlecase)
= tag("meta", property: "og:type", content: "website")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml
index 3ae1ee084..1afdf0b49 100644
--- a/app/views/plantings/_thumbnail.html.haml
+++ b/app/views/plantings/_thumbnail.html.haml
@@ -13,7 +13,7 @@
%dd= link_to planting.garden.name, planting.garden
%dt Planted on:
%dd= planting.planted_at
- %dt Quantity:
+ %dt Quantity:
%dd= "#{display_planting_quantity(planting)}"
%dt Finished on:
%dd= "#{display_finished(planting)}"
diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml
index 14c319a5b..fca0d15b9 100644
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -1,4 +1,4 @@
-- content_for :title, @owner ? t('.title.owner_plantings', owner: @owner) : @crop ? t('.title.crop_plantings', crop: @crop.name) : t('.title.default')
+- content_for :title, @owner ? t('.title.owner_plantings', owner: @owner) : @crop ? t('.title.crop_plantings', crop: @crop.name) : t('.title.default')
- if @owner
= link_to "View #{@owner}'s profile >>", member_path(@owner)
diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml
index 6ad55ff15..20b850978 100644
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -1,10 +1,10 @@
=content_for :title, "#{@planting.crop} in #{@planting.location}"
- content_for :opengraph do
- @planting.crop.photos.each do |photo|
- = tag("meta", property: "og:image", content: photo.fullsize_url)
- = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
+ = tag("meta", property: "og:image", content: photo.fullsize_url)
+ = tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
- if @planting.description
- = tag("meta", property: "og:description", content: @planting.description)
+ = tag("meta", property: "og:description", content: @planting.description)
= tag("meta", property: "og:type", content: "website")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
@@ -31,11 +31,11 @@
%dt Quantity:
%dd
="#{display_planting_quantity(@planting)}"
-
+
- if !@planting.planted_from.blank?
%dt Planted from:
%dd= "#{display_planted_from(@planting)}"
-
+
%dt Sun or shade?
%dd
- sunniness = @planting.sunniness.blank? ? "not specified" : @planting.sunniness
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index 6e0ee6161..a12eff8fa 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -1,8 +1,8 @@
= content_for :title, @post.subject
- content_for :opengraph do
- = tag("meta", property: "og:image", content: avatar_uri(@post.author, 200))
- = tag("meta", property: "og:description", content: "#{strip_tags(@post.body).split(' ')[0..20].join(' ')}...")
- = tag("meta", property: "og:title", content: @post.subject)
+ = tag("meta", property: "og:image", content: avatar_uri(@post.author, 200))
+ = tag("meta", property: "og:description", content: "#{strip_tags(@post.body).split(' ')[0..20].join(' ')}...")
+ = tag("meta", property: "og:title", content: @post.subject)
= tag("meta", property: "og:type", content: "article")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
@@ -18,7 +18,7 @@
= link_to 'hundreds of different crops', crops_url
and a community from all around the world.
- = render :partial => "shared/signin_signup",
+ = render :partial => "shared/signin_signup",
:locals => { :to => "or to start using #{ENV["GROWSTUFF_SITE_NAME"]} to track what you're planting and harvesting" }
= render :partial => "single", :locals => { :post => @post, :subject => false, :hide_comments => true }
diff --git a/app/views/scientific_names/show.html.haml b/app/views/scientific_names/show.html.haml
index b5d9c332f..bcf71c4ca 100644
--- a/app/views/scientific_names/show.html.haml
+++ b/app/views/scientific_names/show.html.haml
@@ -2,7 +2,7 @@
- @scientific_name.crop.photos.each do |photo|
= tag("meta", property: "og:image", content: photo.fullsize_url)
- = tag("meta", property: "og:title", content: @scientific_name.scientific_name)
+ = tag("meta", property: "og:title", content: @scientific_name.scientific_name)
= tag("meta", property: "og:type", content: "website")
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
diff --git a/app/views/seeds/_thumbnail.html.haml b/app/views/seeds/_thumbnail.html.haml
index 7bc5f6ad2..90743d46a 100644
--- a/app/views/seeds/_thumbnail.html.haml
+++ b/app/views/seeds/_thumbnail.html.haml
@@ -11,15 +11,15 @@
= link_to image_tag((seed.crop.default_photo ? seed.crop.default_photo.thumbnail_url : 'placeholder_150.png'), :alt => seed.crop.name, :class => 'img'), seed.crop
.col-md-8
%dl.dl-horizontal
- %dt Crop :
+ %dt Crop :
%dd= link_to seed.crop.name, seed.crop
- %dt Plant before :
+ %dt Plant before :
%dd= seed.plant_before
- %dt Quantity :
+ %dt Quantity :
%dd= seed.quantity
- %dt Will trade to :
+ %dt Will trade to :
%dd= seed.tradable_to
- %dt From location :
+ %dt From location :
%dd= seed.owner.location
%dt Owner :
%dd= link_to seed.owner.login_name, seed.owner
diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml
index 751a3dc17..adbdc0159 100644
--- a/app/views/seeds/show.html.haml
+++ b/app/views/seeds/show.html.haml
@@ -73,5 +73,5 @@
= link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
%p
%small
- Or
+ Or
= link_to "purchase seeds via Ebay", "http://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{URI.escape @seed.crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg", target: "_blank", rel: "noopener noreferrer"
\ No newline at end of file
diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
index da7008d69..1c8da326a 100644
--- a/app/views/shop/index.html.haml
+++ b/app/views/shop/index.html.haml
@@ -81,5 +81,3 @@
or
=link_to "sign up", new_member_registration_path
to purchase.
-
-
diff --git a/bin/rails b/bin/rails
index 728cd85aa..5191e6927 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'
diff --git a/config.rb b/config.rb
index 5cd5b6cc6..bb4bb0a7d 100644
--- a/config.rb
+++ b/config.rb
@@ -16,10 +16,8 @@ images_dir = "app/assets/images"
# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false
-
# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
-
diff --git a/config.ru b/config.ru
index f2d9c08c2..d30ee4f18 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.
-require ::File.expand_path('../config/environment', __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
run Growstuff::Application
diff --git a/config/application.rb b/config/application.rb
index cbc72e4fa..5280dce7e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -82,7 +82,6 @@ module Growstuff
g.javascripts false
end
-
# Growstuff-specific configuration variables
config.currency = 'AUD'
config.bot_email = "noreply@growstuff.org"
@@ -90,7 +89,7 @@ module Growstuff
config.user_agent_email = "info@growstuff.org"
Gibbon::API.api_key = ENV['GROWSTUFF_MAILCHIMP_APIKEY'] || 'notarealkey'
- # API key can't be blank or tests fail
+ # API key can't be blank or tests fail
Gibbon::API.timeout = 10
Gibbon::API.throws_exceptions = false
config.newsletter_list_id = ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']
@@ -108,4 +107,4 @@ module Growstuff
config.active_record.raise_in_transactional_callbacks = true
end
-end
\ No newline at end of file
+end
diff --git a/config/database.yml b/config/database.yml
index eb75b3791..72f6533ae 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,16 +1,10 @@
development:
adapter: postgresql
database: growstuff_dev
- host: localhost
- user: postgres
- password: postgres
test:
adapter: postgresql
database: growstuff_test
- host: localhost
- user: postgres
- password: postgres
production:
adapter: postgresql
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4867e476c..2ed9b8f0a 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -31,7 +31,7 @@ Growstuff::Application.configure do
# Expands the lines which load the assets
config.assets.debug = true
- # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+ # Asset digests allow you to set far-future HTTP expiration dates on all assets,
# yet still be able to expire them through the digest params.
config.assets.digest = true
@@ -48,11 +48,11 @@ Growstuff::Application.configure do
config.action_mailer.delivery_method = :letter_opener
config.action_mailer.smtp_settings = {
- port: '587',
- address: 'smtp.mandrillapp.com',
- user_name: ENV['GROWSTUFF_MANDRILL_USERNAME'],
- password: ENV['GROWSTUFF_MANDRILL_APIKEY'],
- authentication: :login
+ port: '587',
+ address: 'smtp.mandrillapp.com',
+ user_name: ENV['GROWSTUFF_MANDRILL_USERNAME'],
+ password: ENV['GROWSTUFF_MANDRILL_APIKEY'],
+ authentication: :login
}
config.host = 'localhost:8080'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 923ff4e7c..c931c058e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -70,12 +70,12 @@ Growstuff::Application.configure do
config.action_mailer.default_url_options = { host: 'growstuff.org' }
ActionMailer::Base.smtp_settings = {
- port: ENV['SPARKPOST_SMTP_PORT'],
- address: ENV['SPARKPOST_SMTP_HOST'],
- user_name: ENV['SPARKPOST_SMTP_USERNAME'],
- password: ENV['SPARKPOST_SMTP_PASSWORD'],
- authentication: :login,
- enable_starttls_auto: true
+ port: ENV['SPARKPOST_SMTP_PORT'],
+ address: ENV['SPARKPOST_SMTP_HOST'],
+ user_name: ENV['SPARKPOST_SMTP_USERNAME'],
+ password: ENV['SPARKPOST_SMTP_PASSWORD'],
+ authentication: :login,
+ enable_starttls_auto: true
}
ActionMailer::Base.delivery_method = :smtp
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 8b69fb273..a9e242381 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -2,7 +2,7 @@ Growstuff::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
config.action_controller.action_on_unpermitted_parameters = :raise
-
+
# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both threaded web servers
# and those relying on copy on write to perform better.
@@ -72,12 +72,12 @@ Growstuff::Application.configure do
config.action_mailer.default_url_options = { host: 'staging.growstuff.org' }
ActionMailer::Base.smtp_settings = {
- port: ENV['SPARKPOST_SMTP_PORT'],
- address: ENV['SPARKPOST_SMTP_HOST'],
- user_name: ENV['SPARKPOST_SMTP_USERNAME'],
- password: ENV['SPARKPOST_SMTP_PASSWORD'],
- authentication: :login,
- enable_starttls_auto: true
+ port: ENV['SPARKPOST_SMTP_PORT'],
+ address: ENV['SPARKPOST_SMTP_HOST'],
+ user_name: ENV['SPARKPOST_SMTP_USERNAME'],
+ password: ENV['SPARKPOST_SMTP_PASSWORD'],
+ authentication: :login,
+ enable_starttls_auto: true
}
ActionMailer::Base.delivery_method = :smtp
diff --git a/config/environments/test.rb b/config/environments/test.rb
index a6fcb43d3..35836c90b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -26,7 +26,7 @@ Growstuff::Application.configure do
config.action_dispatch.show_exceptions = true
# Disable request forgery protection in test environment
- config.action_controller.allow_forgery_protection = false
+ config.action_controller.allow_forgery_protection = false
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
@@ -38,7 +38,7 @@ Growstuff::Application.configure do
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
-
+
# Growstuff config
config.action_mailer.default_url_options = { host: 'localhost:8080' }
@@ -54,7 +54,6 @@ Growstuff::Application.configure do
::STANDARD_GATEWAY = ActiveMerchant::Billing::PaypalBogusGateway.new
::EXPRESS_GATEWAY = ActiveMerchant::Billing::PaypalBogusGateway.new
end
-
end
Geocoder.configure(lookup: :test)
@@ -101,7 +100,7 @@ Geocoder::Lookup::Test.add_stub(
)
# Unknown location
-Geocoder::Lookup::Test.add_stub( "Tatooine", [])
+Geocoder::Lookup::Test.add_stub("Tatooine", [])
Capybara.configure do |config|
config.always_include_port = true
@@ -110,16 +109,16 @@ end
OmniAuth.config.test_mode = true
# Fake the omniauth
OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new({
- provider: 'facebook',
- uid: '123545',
- info: {
- name: "John Testerson",
- nickname: 'JohnnyT',
- email: 'example.oauth.facebook@example.com',
- image: 'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
- },
- credentials: {
- token: "token",
- secret: "donttell"
- }
-})
\ No newline at end of file
+ provider: 'facebook',
+ uid: '123545',
+ info: {
+ name: "John Testerson",
+ nickname: 'JohnnyT',
+ email: 'example.oauth.facebook@example.com',
+ image: 'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
+ },
+ credentials: {
+ token: "token",
+ secret: "donttell"
+ }
+ })
diff --git a/config/initializers/comfortable_mexican_sofa.rb b/config/initializers/comfortable_mexican_sofa.rb
index fc5025933..3206e14d9 100644
--- a/config/initializers/comfortable_mexican_sofa.rb
+++ b/config/initializers/comfortable_mexican_sofa.rb
@@ -9,7 +9,7 @@ ComfortableMexicanSofa.configure do |config|
# Module responsible for authentication. You can replace it with your own.
# It simply needs to have #authenticate method. See http_auth.rb for reference.
- config.admin_auth = 'CmsDeviseAuth'
+ config.admin_auth = 'CmsDeviseAuth'
# Module responsible for authorization on admin side. It should have #authorize
# method that returns true or false based on params and loaded instance
@@ -91,7 +91,6 @@ ComfortableMexicanSofa.configure do |config|
# Reveal partials that can be overwritten in the admin area.
# Default is false.
# config.reveal_cms_partials = false
-
end
module CmsDeviseAuth
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index d37c92188..ad33e335d 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/LineLength
# Use this hook to configure devise mailer, warden hooks and so forth.
# Many of these configuration options can be set straight in your model.
Devise.setup do |config|
@@ -25,7 +26,7 @@ Devise.setup do |config|
# session. If you need permissions, you should implement that in a before filter.
# You can also supply a hash where the value is a boolean determining whether
# or not authentication should be aborted when the value is not present.
- config.authentication_keys = [ :login ]
+ config.authentication_keys = [:login]
# Configure parameters from the request object used for authentication. Each entry
# given should be a request method and it will automatically be passed to the
@@ -37,12 +38,12 @@ Devise.setup do |config|
# Configure which authentication keys should be case-insensitive.
# These keys will be downcased upon creating or modifying a user and when used
# to authenticate or find a user. Default is :email.
- config.case_insensitive_keys = [ :email ]
+ config.case_insensitive_keys = [:email]
# Configure which authentication keys should have whitespace stripped.
# These keys will have whitespace before and after removed upon creating or
# modifying a user and when used to authenticate or find a user. Default is :email.
- config.strip_whitespace_keys = [ :email, :login_name ]
+ config.strip_whitespace_keys = [:email, :login_name]
# Tell if authentication through request.params is enabled. True by default.
# It can be set to an array that will enable params authentication only for the
@@ -101,7 +102,7 @@ Devise.setup do |config|
config.reconfirmable = true
# Defines which key will be used when confirming an account
- config.confirmation_keys = [ :login ]
+ config.confirmation_keys = [:login]
# ==> Configuration for :rememberable
# The time the user will be remembered without asking for credentials again.
@@ -157,7 +158,7 @@ Devise.setup do |config|
# ==> Configuration for :recoverable
#
# Defines which key will be used when recovering the password for an account
- config.reset_password_keys = [ :login ]
+ config.reset_password_keys = [:login]
# Time interval you can reset your password with a reset password key.
# Don't put a too small interval or your users won't have the time to
diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
index 9c52ced91..67ce37799 100644
--- a/config/initializers/geocoder.rb
+++ b/config/initializers/geocoder.rb
@@ -13,4 +13,4 @@ Geocoder.configure(
# Reported as https://github.com/alexreisner/geocoder/issues/509
if Geocoder.config.lookup != :test
Geocoder.configure(lookup: :nominatim)
-end
\ No newline at end of file
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 074c85f33..4dab98d12 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -6,4 +6,4 @@ end
Sidekiq.configure_client do |config|
config.redis = { url: 'redis://localhost:6379/0', namespace: "app3_sidekiq_#{Rails.env}" }
-end
\ No newline at end of file
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b146f42b1..bb9058e53 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,205 +1,175 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
en:
- forms:
- optional: "(Optional)"
- unauthorized:
- read:
- notification: "You must be signed in to view notifications."
- create:
- planting: "Please sign in or sign up to plant something."
- post: "Please sign in or sign up to post."
- seed: "Please sign in or sign up to add seeds."
- notification: "Please sign in to send a message."
- all: "Please sign in or sign up to create a %{subject}."
- manage:
- all: "Not authorized to %{action} %{subject}."
-
- layouts:
- header:
- skip: "Skip navigation menu"
- browse_crops: &browse_crops "Browse Crops"
- seeds: "Seeds"
- plantings: "Plantings"
- harvests: "Harvests"
- community_map: "Community Map"
- browse_members: "Browse Members"
- posts: "Posts"
- forums: &forums "Forums"
- support_growstuff: "Support Growstuff"
- profile: "Profile"
- gardens: "Gardens"
- account: "Account"
- inbox_unread: "Inbox (%{unread_count})"
- inbox: "Inbox"
- crop_wrangling: "Crop Wrangling"
- admin: "Admin"
- your_stuff: "Your Stuff (%{unread_count})"
-
- crops:
- index:
- title: *browse_crops
- subtitle: "%{crops_size} total"
-
- gardens:
- form:
- location_helper: "If you have a location set in your profile, it will be used when
- you create a new garden."
-
- seeds:
- index:
- title:
- default: "Everyone's seeds"
- crop_seeds: "Everyone's %{crop} seeds"
- owner_seeds: "%{owner} seeds"
- form:
- trade_help: "Are you interested in trading or swapping seeds with other
- %{site_name} members? If you
- list your seeds as available for trade, other members can
- contact you to request seeds. You can list any conditions or
- other information in the description, above."
-
- plantings:
- index:
- title:
- default: "Everyone's plantings"
- crop_plantings: "Everyone's %{crop} plantings"
- owner_plantings: "%{owner} plantings"
- form:
- finish_helper: "A planting is finished when you've harvested all of the crop, or
- it dies, or it's otherwise no longer growing in your garden."
-
- photos:
- show:
- thing_by: "A %{thing} by %{owner}"
-
- harvests:
- index:
- title:
- default: "Everyone's harvests"
- crop_harvests: "Everyone's %{crop} harvests"
- owner_harvests: "%{owner} harvests"
-
- places:
- index:
- title: "%{site_name} Community Map"
-
- members:
- index:
- title: "%{site_name} members"
-
- posts:
- index:
- title:
- default: "Everyone's posts"
- author_posts: "%{author} posts"
-
- shop:
- index:
- title: "Shop"
-
- forums:
- index:
- title: *forums
-
- home:
- blurb:
- intro: "%{site_name} is a community of food gardeners. We're building an open source platform to help you learn about growing food, track what you plant and harvest, and swap seeds and produce with other gardeners near you."
- perks: "Join now for your free garden journal, seed sharing, forums, and more."
- sign_up: "Sign up"
- already_html: "Or %{sign_in} if you already have an account"
- sign_in_linktext: "sign in"
-
- crops:
- our_crops: "Some of our crops"
- recently_planted: "Recently planted"
- recently_added: "Recently added crops"
- view_all: "View all crops"
-
- discuss:
- discussion: "Discussion"
- forums: "Forums"
- view_all: "View all posts"
-
- members:
- title: "Some of our members"
- view_all: "View all members"
-
- open:
- open_source_title: "Open Source"
- open_source_body_html: "%{site_name} is open source software, which means that we share this website's code for free with our community and the world. We believe that openness, sustainability, and social good go hand in hand. You can read more about %{why} or check out our code on %{github}."
- why_linktext: "why Growstuff is open source"
- github_linktext: "Github"
- open_data_title: "Open Data and APIs"
- open_data_body_html: "We're building a database of crops, planting advice, seed sources, and other information that anyone can use for free, under a %{creative_commons_link}. You can use this data for research, to build apps, or for any purpose at all. Read more about our %{wiki_link} and %{api_docs_link}."
- creative_commons_linktext: "Creative Commons license"
- wiki_linktext: "open data"
- api_docs_linktext: "API documentation"
- get_involved_title: "Get Involved"
- get_involved_body_html: "We believe in collaboration, and work closely with our members and the wider food-growing community. Our team includes volunteers from all walks of life and all skill levels. To get involved, visit %{talk_link} or find more information on the %{wiki_link}."
- talk_linktext: "Growstuff Talk"
- wiki_linktext: "Growstuff Wiki"
- support_title: "Support Growstuff"
- support_body_html: "Growstuff is independent, %{ad_free} and we have no outside investment. You can support our work by %{buy_account}."
- ad_free_linktext: "ad-free"
- buy_account_linktext: "buying a paid account"
-
- seeds:
- title: "Seeds available to trade"
- owner: "Owner"
- crop: "Crop"
- description: "Description"
- trade_to: "Will trade to"
- from: "From location"
- unspecified: "unspecified"
- details: "Details"
- view_all: "View all seeds"
-
- stats:
- message_html: "So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}."
- member_linktext: "%{count} members"
- number_crops_linktext: "%{count} crops"
- number_plantings_linktext: "%{count} times"
- number_gardens_linktext: "%{count} gardens"
-
- index:
- welcome: "Welcome to %{site_name}, %{member_name}"
- plant: "Plant"
- harvest: "Harvest"
- add_seeds: "Add seeds"
- post: "Post"
- edit_profile: "Edit profile"
-
activerecord:
models:
comment:
- one: "comment"
- other: "comments"
+ one: comment
+ other: comments
crop:
- one: "crop"
- other: "crops"
+ one: crop
+ other: crops
follow:
- one: "follow"
- other: "follows"
+ one: follow
+ other: follows
garden:
- one: "garden"
- other: "gardens"
+ one: garden
+ other: gardens
harvest:
- one: "harvest"
- other: "harvests"
+ one: harvest
+ other: harvests
member:
- one: "member"
- other: "members"
+ one: member
+ other: members
photo:
- one: "photo"
- other: "photos"
+ one: photo
+ other: photos
planting:
- one: "planting"
- other: "plantings"
+ one: planting
+ other: plantings
post:
- one: "post"
- other: "posts"
+ one: post
+ other: posts
seed:
- one: "seed"
- other: "seeds"
+ one: seed
+ other: seeds
+ crops:
+ index:
+ subtitle: "%{crops_size} total"
+ title: Browse Crops
+ forms:
+ optional: "(Optional)"
+ forums:
+ index:
+ title: Forums
+ gardens:
+ form:
+ location_helper: If you have a location set in your profile, it will be used when you create a new garden.
+ harvests:
+ index:
+ title:
+ crop_harvests: Everyone's %{crop} harvests
+ default: Everyone's harvests
+ owner_harvests: "%{owner} harvests"
+ home:
+ blurb:
+ already_html: Or %{sign_in} if you already have an account
+ intro: "%{site_name} is a community of food gardeners. We're building an open source platform to help you learn about growing food, track what you plant and harvest, and swap seeds and produce with other gardeners near you."
+ perks: Join now for your free garden journal, seed sharing, forums, and more.
+ sign_in_linktext: sign in
+ sign_up: Sign up
+ crops:
+ our_crops: Some of our crops
+ recently_added: Recently added crops
+ recently_planted: Recently planted
+ view_all: View all crops
+ discuss:
+ discussion: Discussion
+ forums: Forums
+ view_all: View all posts
+ index:
+ add_seeds: Add seeds
+ edit_profile: Edit profile
+ harvest: Harvest
+ plant: Plant
+ post: Post
+ welcome: Welcome to %{site_name}, %{member_name}
+ members:
+ title: Some of our members
+ view_all: View all members
+ open:
+ ad_free_linktext: ad-free
+ api_docs_linktext: API documentation
+ buy_account_linktext: buying a paid account
+ creative_commons_linktext: Creative Commons license
+ get_involved_body_html: We believe in collaboration, and work closely with our members and the wider food-growing community. Our team includes volunteers from all walks of life and all skill levels. To get involved, visit %{talk_link} or find more information on the %{wiki_link}.
+ get_involved_title: Get Involved
+ github_linktext: Github
+ open_data_body_html: We're building a database of crops, planting advice, seed sources, and other information that anyone can use for free, under a %{creative_commons_link}. You can use this data for research, to build apps, or for any purpose at all. Read more about our %{wiki_link} and %{api_docs_link}.
+ open_data_title: Open Data and APIs
+ open_source_body_html: "%{site_name} is open source software, which means that we share this website's code for free with our community and the world. We believe that openness, sustainability, and social good go hand in hand. You can read more about %{why} or check out our code on %{github}."
+ open_source_title: Open Source
+ support_body_html: Growstuff is independent, %{ad_free} and we have no outside investment. You can support our work by %{buy_account}.
+ support_title: Support Growstuff
+ talk_linktext: Growstuff Talk
+ why_linktext: why Growstuff is open source
+ wiki_linktext: Growstuff Wiki
+ seeds:
+ crop: Crop
+ description: Description
+ details: Details
+ from: From location
+ owner: Owner
+ title: Seeds available to trade
+ trade_to: Will trade to
+ unspecified: unspecified
+ view_all: View all seeds
+ stats:
+ member_linktext: "%{count} members"
+ message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}.
+ number_crops_linktext: "%{count} crops"
+ number_gardens_linktext: "%{count} gardens"
+ number_plantings_linktext: "%{count} times"
+ layouts:
+ header:
+ account: Account
+ admin: Admin
+ browse_crops: Browse Crops
+ browse_members: Browse Members
+ community_map: Community Map
+ crop_wrangling: Crop Wrangling
+ forums: Forums
+ gardens: Gardens
+ harvests: Harvests
+ inbox: Inbox
+ inbox_unread: Inbox (%{unread_count})
+ plantings: Plantings
+ posts: Posts
+ profile: Profile
+ seeds: Seeds
+ skip: Skip navigation menu
+ support_growstuff: Support Growstuff
+ your_stuff: Your Stuff (%{unread_count})
+ members:
+ index:
+ title: "%{site_name} members"
+ photos:
+ show:
+ thing_by: A %{thing} by %{owner}
+ places:
+ index:
+ title: "%{site_name} Community Map"
+ plantings:
+ form:
+ finish_helper: A planting is finished when you've harvested all of the crop, or it dies, or it's otherwise no longer growing in your garden.
+ index:
+ title:
+ crop_plantings: Everyone's %{crop} plantings
+ default: Everyone's plantings
+ owner_plantings: "%{owner} plantings"
+ posts:
+ index:
+ title:
+ author_posts: "%{author} posts"
+ default: Everyone's posts
+ seeds:
+ form:
+ trade_help: Are you interested in trading or swapping seeds with other %{site_name} members? If you list your seeds as available for trade, other members can contact you to request seeds. You can list any conditions or other information in the description, above.
+ index:
+ title:
+ crop_seeds: Everyone's %{crop} seeds
+ default: Everyone's seeds
+ owner_seeds: "%{owner} seeds"
+ shop:
+ index:
+ title: Shop
+ unauthorized:
+ create:
+ all: Please sign in or sign up to create a %{subject}.
+ notification: Please sign in to send a message.
+ planting: Please sign in or sign up to plant something.
+ post: Please sign in or sign up to post.
+ seed: Please sign in or sign up to add seeds.
+ manage:
+ all: Not authorized to %{action} %{subject}.
+ read:
+ notification: You must be signed in to view notifications.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 925a54399..fa240b7c3 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,5 +1,4 @@
ja:
home:
- blurb:
+ blurb:
intro: "%{site_name}はガーデナーのコミュニティです。"
-
\ No newline at end of file
diff --git a/config/newrelic.yml b/config/newrelic.yml
index 4e1be6e68..63500e405 100644
--- a/config/newrelic.yml
+++ b/config/newrelic.yml
@@ -6,7 +6,7 @@ common: &default_settings
# account. This key binds your Agent's data to your account in the
# New Relic service.
license_key: '<%= ENV["NEW_RELIC_LICENSE_KEY"] %>'
-
+
# Agent Enabled (Rails Only)
# Use this setting to force the agent to run or not run.
# Default is 'auto' which means the agent will install and run only
@@ -16,7 +16,7 @@ common: &default_settings
# Valid values are true, false and auto.
#
# agent_enabled: auto
-
+
# Application Name Set this to be the name of your application as
# you'd like it show up in New Relic. The service will then auto-map
# instances of your application into an "application" on your
@@ -31,12 +31,12 @@ common: &default_settings
# app_name:
# - Ajax Service
# - All Services
- #
+ #
app_name: <%= ENV["NEW_RELIC_APP_NAME"] %>
- # When "true", the agent collects performance data about your
- # application and reports this data to the New Relic service at
- # newrelic.com. This global switch is normally overridden for each
+ # When "true", the agent collects performance data about your
+ # application and reports this data to the New Relic service at
+ # newrelic.com. This global switch is normally overridden for each
# environment below. (formerly called 'enabled')
monitor_mode: true
@@ -54,7 +54,7 @@ common: &default_settings
# '/var/log/') The agent will attempt to create this directory if it
# does not exist.
# log_file_path: 'log'
-
+
# Optionally set the name of the log file, defaults to 'newrelic_agent.log'
# log_file_name: 'newrelic_agent.log'
@@ -77,28 +77,28 @@ common: &default_settings
# use a non-blocking lookup, so in a worst case, if you have DNS
# problems, your app may block indefinitely.
# verify_certificate: true
-
+
# Set your application's Apdex threshold value with the 'apdex_t'
# setting, in seconds. The apdex_t value determines the buckets used
- # to compute your overall Apdex score.
+ # to compute your overall Apdex score.
# Requests that take less than apdex_t seconds to process will be
# classified as Satisfying transactions; more than apdex_t seconds
# as Tolerating transactions; and more than four times the apdex_t
- # value as Frustrating transactions.
+ # value as Frustrating transactions.
# For more about the Apdex standard, see
# http://newrelic.com/docs/general/apdex
apdex_t: 0.5
-
+
#============================== Browser Monitoring ===============================
# New Relic Real User Monitoring gives you insight into the performance real users are
# experiencing with your website. This is accomplished by measuring the time it takes for
# your users' browsers to download and render your web pages by injecting a small amount
- # of JavaScript code into the header and footer of each page.
+ # of JavaScript code into the header and footer of each page.
browser_monitoring:
- # By default the agent automatically injects the monitoring JavaScript
- # into web pages. Set this attribute to false to turn off this behavior.
- auto_instrument: true
+ # By default the agent automatically injects the monitoring JavaScript
+ # into web pages. Set this attribute to false to turn off this behavior.
+ auto_instrument: true
# Proxy settings for connecting to the service.
#
@@ -110,14 +110,14 @@ common: &default_settings
# proxy_user:
# proxy_pass:
-
+
# Tells transaction tracer and error collector (when enabled)
# whether or not to capture HTTP params. When true, frameworks can
# exclude HTTP parameters from being captured.
# Rails: the RoR filter_parameter_logging excludes parameters
# Java: create a config setting called "ignored_params" and set it to
# a comma separated list of HTTP parameter names.
- # ex: ignored_params: credit_card, ssn, password
+ # ex: ignored_params: credit_card, ssn, password
capture_params: false
@@ -126,12 +126,12 @@ common: &default_settings
# minute. Included in the transaction is the exact call sequence of
# the transactions including any SQL statements issued.
transaction_tracer:
-
+
# Transaction tracer is enabled by default. Set this to false to
# turn it off. This feature is only available at the Professional
# and above product levels.
enabled: true
-
+
# Threshold in seconds for when to collect a transaction
# trace. When the response time of a controller action exceeds
# this threshold, a transaction trace will be recorded and sent to
@@ -139,13 +139,13 @@ common: &default_settings
# "apdex_f", which will use the threshold for an dissatisfying
# Apdex controller action - four times the Apdex T value.
transaction_threshold: apdex_f
-
+
# When transaction tracer is on, SQL statements can optionally be
# recorded. The recorder has three modes, "off" which sends no
# SQL, "raw" which sends the SQL statement in its original form,
# and "obfuscated", which strips out numeric and string literals
record_sql: obfuscated
-
+
# Threshold in seconds for when to collect stack trace for a SQL
# call. In other words, when SQL statements exceed this threshold,
# then capture and send the current stack trace. This is
@@ -157,24 +157,24 @@ common: &default_settings
# set to false when using other adapters.
# explain_enabled: true
- # Threshold for query execution time below which query plans will not
+ # Threshold for query execution time below which query plans will not
# not be captured. Relevant only when `explain_enabled` is true.
# explain_threshold: 0.5
-
+
# Error collector captures information about uncaught exceptions and
# sends them to the service for viewing
error_collector:
-
+
# Error collector is enabled by default. Set this to false to turn
# it off. This feature is only available at the Professional and above
# product levels
enabled: true
-
- # Rails Only - tells error collector whether or not to capture a
- # source snippet around the place of the error when errors are View
+
+ # Rails Only - tells error collector whether or not to capture a
+ # source snippet around the place of the error when errors are View
# related.
- capture_source: true
-
+ capture_source: true
+
# To stop specific errors from reporting to New Relic, set this property
# to comma separated values. Default is to ignore routing errors
# which are how 404's get triggered.
@@ -185,7 +185,7 @@ common: &default_settings
# won't run. Useful when you are using the agent to monitor an
# external resource
# disable_samplers: true
-
+
# If you aren't interested in visibility in these areas, you can
# disable the instrumentation to reduce overhead.
#
@@ -199,8 +199,8 @@ common: &default_settings
# overhead slightly on every memcached call, and can have security
# implications if your memcached keys are sensitive
# capture_memcache_keys: true
-
- # Certain types of instrumentation such as GC stats will not work if
+
+ # Certain types of instrumentation such as GC stats will not work if
# you are running multi-threaded. Please let us know.
# multi_threaded = false
@@ -216,19 +216,19 @@ common: &default_settings
development:
<<: *default_settings
- # Turn off communication to New Relic service in development mode (also
+ # Turn off communication to New Relic service in development mode (also
# 'enabled').
- # NOTE: for initial evaluation purposes, you may want to temporarily
+ # NOTE: for initial evaluation purposes, you may want to temporarily
# turn the agent on in development mode.
monitor_mode: false
- # Rails Only - when running in Developer Mode, the New Relic Agent will
+ # Rails Only - when running in Developer Mode, the New Relic Agent will
# present performance information on the last 100 transactions you have
# executed since starting the mongrel.
# NOTE: There is substantial overhead when running in developer mode.
- # Do not use for production or load testing.
+ # Do not use for production or load testing.
developer_mode: true
-
+
# Enable textmate links
# textmate: true
diff --git a/config/routes.rb b/config/routes.rb
index 8d373feff..e12cca00e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,10 +1,14 @@
-Growstuff::Application.routes.draw do
-
+Growstuff::Application.routes.draw do # rubocop:disable Metrics/BlockLength
get '/robots.txt' => 'robots#robots'
resources :plant_parts
- devise_for :members, controllers: { registrations: "registrations", passwords: "passwords", sessions: "sessions", omniauth_callbacks: "omniauth_callbacks" }
+ devise_for :members, controllers: {
+ registrations: "registrations",
+ passwords: "passwords",
+ sessions: "sessions",
+ omniauth_callbacks: "omniauth_callbacks"
+ }
devise_scope :member do
get '/members/unsubscribe/:message' => 'members#unsubscribe', :as => 'unsubscribe_member'
end
@@ -53,7 +57,6 @@ Growstuff::Application.routes.draw do
get '/members/:login_name/follows' => 'members#view_follows', :as => 'member_follows'
get '/members/:login_name/followers' => 'members#view_followers', :as => 'member_followers'
-
get '/places' => 'places#index'
get '/places/search' => 'places#search', :as => 'search_places'
get '/places/:place' => 'places#show', :as => 'place'
@@ -86,7 +89,6 @@ Growstuff::Application.routes.draw do
get '/.well-known/acme-challenge/:id' => 'pages#letsencrypt'
-# CMS stuff -- must remain LAST
+ # CMS stuff -- must remain LAST
comfy_route :cms, path: '/', sitemap: false
-
end
diff --git a/config/unicorn.rb b/config/unicorn.rb
index dfd7ac833..e4153a81f 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -4,7 +4,6 @@ timeout 30
preload_app true
before_fork do |server, worker|
-
Signal.trap 'TERM' do
puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
Process.kill 'QUIT', Process.pid
@@ -15,7 +14,6 @@ before_fork do |server, worker|
end
after_fork do |server, worker|
-
Signal.trap 'TERM' do
puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
end
diff --git a/db/migrate/20120903092956_devise_create_users.rb b/db/migrate/20120903092956_devise_create_users.rb
index f956c1e5a..cf02cbe2a 100644
--- a/db/migrate/20120903092956_devise_create_users.rb
+++ b/db/migrate/20120903092956_devise_create_users.rb
@@ -33,7 +33,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
## Token authenticatable
# t.string :authentication_token
-
t.timestamps null: true
end
diff --git a/db/migrate/20121109130033_add_creation_index_to_updates.rb b/db/migrate/20121109130033_add_creation_index_to_updates.rb
index cb94c6b26..4e3f4c560 100644
--- a/db/migrate/20121109130033_add_creation_index_to_updates.rb
+++ b/db/migrate/20121109130033_add_creation_index_to_updates.rb
@@ -1,5 +1,5 @@
class AddCreationIndexToUpdates < ActiveRecord::Migration
def change
- add_index :updates, [:created_at, :user_id]
+ add_index :updates, [:created_at, :user_id]
end
end
diff --git a/db/migrate/20130326092227_change_planted_at_to_date.rb b/db/migrate/20130326092227_change_planted_at_to_date.rb
index 9fb361a0e..bf14c624d 100644
--- a/db/migrate/20130326092227_change_planted_at_to_date.rb
+++ b/db/migrate/20130326092227_change_planted_at_to_date.rb
@@ -1,5 +1,5 @@
class ChangePlantedAtToDate < ActiveRecord::Migration
def change
change_column :plantings, :planted_at, :date
- end
+ end
end
diff --git a/db/migrate/20130518002942_rename_account_detail_to_account.rb b/db/migrate/20130518002942_rename_account_detail_to_account.rb
index 8c2243431..0a8434694 100644
--- a/db/migrate/20130518002942_rename_account_detail_to_account.rb
+++ b/db/migrate/20130518002942_rename_account_detail_to_account.rb
@@ -2,5 +2,4 @@ class RenameAccountDetailToAccount < ActiveRecord::Migration
def change
rename_table :account_details, :accounts
end
-
end
diff --git a/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb b/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb
index 84cf7a7b4..01afc35d3 100644
--- a/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb
+++ b/db/migrate/20130601011725_change_flickr_photo_id_to_string.rb
@@ -3,6 +3,7 @@ class ChangeFlickrPhotoIdToString < ActiveRecord::Migration
remove_column :photos, :flickr_photo_id
add_column :photos, :flickr_photo_id, :string
end
+
def down
# Postgres doesn't allow you to cast strings to integers
# Hence there's no way of rolling back this migration without losing
diff --git a/db/migrate/20140928044231_add_crops_posts_table.rb b/db/migrate/20140928044231_add_crops_posts_table.rb
index 6f200c3d8..475a993f5 100644
--- a/db/migrate/20140928044231_add_crops_posts_table.rb
+++ b/db/migrate/20140928044231_add_crops_posts_table.rb
@@ -7,4 +7,4 @@ class AddCropsPostsTable < ActiveRecord::Migration
add_index :crops_posts, [:crop_id, :post_id]
add_index :crops_posts, :crop_id
end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb b/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb
index 1ac6af7f2..cb9e58d3a 100644
--- a/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb
+++ b/db/migrate/20141119130555_change_follows_member_id_to_follower_id.rb
@@ -1,5 +1,5 @@
class ChangeFollowsMemberIdToFollowerId < ActiveRecord::Migration
def change
- rename_column :follows, :member_id, :follower_id
+ rename_column :follows, :member_id, :follower_id
end
end
diff --git a/db/migrate/20150201052245_create_cms.rb b/db/migrate/20150201052245_create_cms.rb
index edebc41fe..2a187e66f 100644
--- a/db/migrate/20150201052245_create_cms.rb
+++ b/db/migrate/20150201052245_create_cms.rb
@@ -1,14 +1,12 @@
class CreateCms < ActiveRecord::Migration
-
- def self.up
-
+ def self.up # rubocop:disable Metrics/MethodLength
text_limit = case ActiveRecord::Base.connection.adapter_name
- when 'PostgreSQL'
- { }
- else
- { limit: 16777215 }
- end
-
+ when 'PostgreSQL'
+ {}
+ else
+ { limit: 16777215 }
+ end
+
# -- Sites --------------------------------------------------------------
create_table :comfy_cms_sites do |t|
t.string :label, null: false
@@ -20,7 +18,7 @@ class CreateCms < ActiveRecord::Migration
end
add_index :comfy_cms_sites, :hostname
add_index :comfy_cms_sites, :is_mirrored
-
+
# -- Layouts ------------------------------------------------------------
create_table :comfy_cms_layouts do |t|
t.integer :site_id, null: false
@@ -37,14 +35,14 @@ class CreateCms < ActiveRecord::Migration
end
add_index :comfy_cms_layouts, [:parent_id, :position]
add_index :comfy_cms_layouts, [:site_id, :identifier], unique: true
-
+
# -- Pages --------------------------------------------------------------
create_table :comfy_cms_pages do |t|
t.integer :site_id, null: false
t.integer :layout_id
t.integer :parent_id
t.integer :target_page_id
- t.string :label, null: false
+ t.string :label, null: false
t.string :slug
t.string :full_path, null: false
t.text :content_cache, text_limit
@@ -56,7 +54,7 @@ class CreateCms < ActiveRecord::Migration
end
add_index :comfy_cms_pages, [:site_id, :full_path]
add_index :comfy_cms_pages, [:parent_id, :position]
-
+
# -- Page Blocks --------------------------------------------------------
create_table :comfy_cms_blocks do |t|
t.string :identifier, null: false
@@ -66,7 +64,7 @@ class CreateCms < ActiveRecord::Migration
end
add_index :comfy_cms_blocks, [:identifier]
add_index :comfy_cms_blocks, [:blockable_id, :blockable_type]
-
+
# -- Snippets -----------------------------------------------------------
create_table :comfy_cms_snippets do |t|
t.integer :site_id, null: false
@@ -79,10 +77,10 @@ class CreateCms < ActiveRecord::Migration
end
add_index :comfy_cms_snippets, [:site_id, :identifier], unique: true
add_index :comfy_cms_snippets, [:site_id, :position]
-
+
# -- Files --------------------------------------------------------------
create_table :comfy_cms_files do |t|
- t.integer :site_id, null: false
+ t.integer :site_id, null: false
t.integer :block_id
t.string :label, null: false
t.string :file_file_name, null: false
@@ -96,7 +94,7 @@ class CreateCms < ActiveRecord::Migration
add_index :comfy_cms_files, [:site_id, :file_file_name]
add_index :comfy_cms_files, [:site_id, :position]
add_index :comfy_cms_files, [:site_id, :block_id]
-
+
# -- Revisions -----------------------------------------------------------
create_table :comfy_cms_revisions, force: true do |t|
t.string :record_type, null: false
@@ -106,25 +104,27 @@ class CreateCms < ActiveRecord::Migration
end
add_index :comfy_cms_revisions, [:record_type, :record_id, :created_at],
name: 'index_cms_revisions_on_rtype_and_rid_and_created_at'
-
+
# -- Categories ---------------------------------------------------------
create_table :comfy_cms_categories, force: true do |t|
t.integer :site_id, null: false
t.string :label, null: false
t.string :categorized_type, null: false
end
- add_index :comfy_cms_categories, [:site_id, :categorized_type, :label], unique: true,
+ add_index :comfy_cms_categories, [:site_id, :categorized_type, :label],
+ unique: true,
name: 'index_cms_categories_on_site_id_and_cat_type_and_label'
-
+
create_table :comfy_cms_categorizations, force: true do |t|
t.integer :category_id, null: false
t.string :categorized_type, null: false
t.integer :categorized_id, null: false
end
- add_index :comfy_cms_categorizations, [:category_id, :categorized_type, :categorized_id], unique: true,
+ add_index :comfy_cms_categorizations, [:category_id, :categorized_type, :categorized_id],
+ unique: true,
name: 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
end
-
+
def self.down
drop_table :comfy_cms_sites
drop_table :comfy_cms_layouts
@@ -137,4 +137,3 @@ class CreateCms < ActiveRecord::Migration
drop_table :comfy_cms_categorizations
end
end
-
diff --git a/db/seeds.rb b/db/seeds.rb
index f1b8d67cb..6503cde74 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -69,16 +69,15 @@ def load_test_users
puts "Warning: unable to open suburbs.csv"
end
-
# rake parameter (eg. 'rake db:seed member_size=10')
member_size = ENV['member_size'] ? ENV['member_size'].to_i : 3
(1..member_size).each do |i|
@user = Member.new(
- login_name: "test#{i}",
- email: "test#{i}@example.com",
- password: "password#{i}",
- tos_agreement: true
+ login_name: "test#{i}",
+ email: "test#{i}@example.com",
+ password: "password#{i}",
+ tos_agreement: true
)
@user.skip_confirmation!
@user.save!
@@ -88,8 +87,8 @@ def load_test_users
suburb_file.pos = 0 if suburb_file.eof?
row = CSV.parse(suburb_file.readline)
- suburb,country,state,latitude,longitude = row[0]
- # Using 'update_column' method instead of 'update' so that
+ suburb, country, state, latitude, longitude = row[0]
+ # Using 'update_column' method instead of 'update' so that
# it avoids accessing Geocoding service for faster processing
@user.gardens.first.update_columns(location: suburb, latitude: latitude, longitude: longitude)
@user.update_columns(location: suburb, latitude: latitude, longitude: longitude)
@@ -199,7 +198,7 @@ def load_plant_parts
end
def select_random_item(array)
- array[rand(0..array.size-1) % array.size]
+ array[rand(0..array.size - 1) % array.size]
end
load_data
diff --git a/db/seeds/crops-00.csv b/db/seeds/crops-00.csv
index adad852cb..86b668785 100644
--- a/db/seeds/crops-00.csv
+++ b/db/seeds/crops-00.csv
@@ -205,7 +205,7 @@ summer savory,https://en.wikipedia.org/wiki/Summer_savory,,Satureja hortensis
sunflowers,https://en.wikipedia.org/wiki/Sunflower,,Helianthus annuus
sweet potato,https://en.wikipedia.org/wiki/Sweet_potato,,Ipomoea batatas
Swiss chard,https://en.wikipedia.org/wiki/Swiss_chard,,Beta vulgaris var. cicla
-tamarillo,https://en.wikipedia.org/wiki/Tamarillo,,Solanum betaceum
+tamarillo,https://en.wikipedia.org/wiki/Tamarillo,,Solanum betaceum
tamarind,https://en.wikipedia.org/wiki/Tamarind,,Tamarindus indica
tangerine,https://en.wikipedia.org/wiki/Tangerine,,Citrus tangerina
tansy,https://en.wikipedia.org/wiki/Tansy,,Tanacetum vulgare
diff --git a/lib/actions/oauth_signup_action.rb b/lib/actions/oauth_signup_action.rb
index 542c4e6b8..7d4913c21 100644
--- a/lib/actions/oauth_signup_action.rb
+++ b/lib/actions/oauth_signup_action.rb
@@ -1,8 +1,7 @@
class Growstuff::OauthSignupAction
-
#
# Inspects the omniauth information
- # and determines if we have an existing member
+ # and determines if we have an existing member
# (to add authentication to)
# or if this is a new signup
#
@@ -12,14 +11,14 @@ class Growstuff::OauthSignupAction
def find_or_create_from_authorization(auth)
member ||= Member.where(email: auth.info.email).first_or_create do |m|
m.email = auth.info.email
- m.password = Devise.friendly_token[0,20]
+ m.password = Devise.friendly_token[0, 20]
# First, try the nickname or friendly generate from the email
m.login_name = auth.info.nickname || auth.info.email.split("@").first.gsub(/[^A-Za-z]+/, '_').underscore
# Do we have a collision with an existing account? Generate a 20 character long random name
# so the user can update it later
- m.login_name = Devise.friendly_token[0,20] if Member.where(login_name: m.login_name).any?
+ m.login_name = Devise.friendly_token[0, 20] if Member.where(login_name: m.login_name).any?
m.preferred_avatar_uri = auth.info.image # assuming the user model has an image
m.skip_confirmation!
@@ -27,7 +26,7 @@ class Growstuff::OauthSignupAction
end
member.save!
-
+
member
end
@@ -73,4 +72,4 @@ class Growstuff::OauthSignupAction
name
end
-end
\ No newline at end of file
+end
diff --git a/lib/geocodable.rb b/lib/geocodable.rb
index 2b914b535..68b137acf 100644
--- a/lib/geocodable.rb
+++ b/lib/geocodable.rb
@@ -8,7 +8,7 @@ module Geocodable
def geocode
unless self.location.blank?
self.latitude, self.longitude =
- Geocoder.coordinates(location, params: {limit: 1})
+ Geocoder.coordinates(location, params: { limit: 1 })
end
end
@@ -18,5 +18,4 @@ module Geocodable
self.longitude = nil
end
end
-
end
diff --git a/lib/haml/filters/escaped_markdown.rb b/lib/haml/filters/escaped_markdown.rb
index 4b0c7e9cc..1986b905d 100644
--- a/lib/haml/filters/escaped_markdown.rb
+++ b/lib/haml/filters/escaped_markdown.rb
@@ -9,8 +9,7 @@ module Haml::Filters
end
end
-# Register it as the handler for the :escaped_markdown HAML command.
-# The automatic system gives us :escapedmarkdown, which is ugly.
-defined['escaped_markdown'] = EscapedMarkdown
-
+ # Register it as the handler for the :escaped_markdown HAML command.
+ # The automatic system gives us :escapedmarkdown, which is ugly.
+ defined['escaped_markdown'] = EscapedMarkdown
end
diff --git a/lib/haml/filters/growstuff_markdown.rb b/lib/haml/filters/growstuff_markdown.rb
index bb665e810..ebd3ecebe 100644
--- a/lib/haml/filters/growstuff_markdown.rb
+++ b/lib/haml/filters/growstuff_markdown.rb
@@ -9,7 +9,6 @@ module Haml::Filters
include Haml::Filters::Base
def render(text)
-
# turn [tomato](crop) into [tomato](http://growstuff.org/crops/tomato)
expanded = text.gsub(CROP_REGEX) do |m|
crop_str = $1
@@ -52,12 +51,10 @@ module Haml::Filters
expanded = expanded.gsub(MEMBER_ESCAPE_AT_REGEX, "")
return BlueCloth.new(expanded).to_html
-
end
end
-# Register it as the handler for the :growstuff_markdown HAML command.
-# The automatic system gives us :growstuffmarkdown, which is ugly.
-defined['growstuff_markdown'] = GrowstuffMarkdown
-
+ # Register it as the handler for the :growstuff_markdown HAML command.
+ # The automatic system gives us :growstuffmarkdown, which is ugly.
+ defined['growstuff_markdown'] = GrowstuffMarkdown
end
diff --git a/lib/tasks/growstuff.rake b/lib/tasks/growstuff.rake
index 86398cdb5..fd0258309 100644
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -1,21 +1,26 @@
namespace :growstuff do
-
desc "Add an admin user, by name"
# usage: rake growstuff:admin_user name=skud
task admin_user: :environment do
- member = Member.find_by_login_name(ENV['name']) or raise "Usage: rake growstuff:admin_user name=whoever (login name is case-sensitive)"
- admin = Role.find('admin')
- member.roles << admin
+ add_role_to_member! ENV['name'], 'admin'
end
desc "Add a crop wrangler user, by name"
# usage: rake growstuff:cropwrangler_user name=skud
task cropwrangler_user: :environment do
- member = Member.find_by_login_name(ENV['name']) or raise "Usage: rake growstuff:cropwrangler_user name=whoever (login name is case-sensitive)"
- cw = Role.find('crop-wrangler')
- member.roles << cw
+ add_role_to_member! ENV['name'], 'crop-wrangler'
+ end
+
+ def add_role_to_member!(login_name, role_name)
+ unless login_name && role_name
+ raise "Usage: rake growstuff:[rolename] name=[username] "\
+ "\n (login name is case-sensitive)\n"
+ end
+ member = Member.find_by!(login_name: login_name)
+ role = Role.find_by!(name: role_name)
+ member.roles << role
end
desc "Upload crops from a CSV file"
@@ -32,7 +37,6 @@ namespace :growstuff do
end
Rails.cache.delete('full_crop_hierarchy')
puts "Finished loading crops"
-
end
desc "Send planting reminder email"
@@ -67,10 +71,8 @@ namespace :growstuff do
desc "One-off tasks needed at various times and kept for posterity"
namespace :oneoff do
-
desc "May 2013: replace any empty notification subjects with (no subject)"
task empty_subjects: :environment do
-
# this is inefficient as it checks every Notification, but the
# site is small and there aren't many of them, so it shouldn't matter
# for this one-off script.
@@ -82,7 +84,6 @@ namespace :growstuff do
desc "May 2013: replace any empty garden names with Garden"
task empty_garden_names: :environment do
-
# this is inefficient as it checks every Garden, but the
# site is small and there aren't many of them, so it shouldn't matter
# for this one-off script.
@@ -94,7 +95,6 @@ namespace :growstuff do
end
end
-
desc "June 2013: create account types and products."
task setup_shop: :environment do
puts "Adding account types..."
@@ -103,33 +103,37 @@ namespace :growstuff do
is_paid: false,
is_permanent_paid: false
)
- @paid_account = AccountType.find_or_create_by(
+ @paid_account = AccountType.find_or_create_by(
name: "Paid",
is_paid: true,
is_permanent_paid: false
)
- @seed_account = AccountType.find_or_create_by(
+ @seed_account = AccountType.find_or_create_by(
name: "Seed",
is_paid: true,
is_permanent_paid: true
)
- @staff_account = AccountType.find_or_create_by(
+ @staff_account = AccountType.find_or_create_by(
name: "Staff",
is_paid: true,
is_permanent_paid: true
)
puts "Adding products..."
- Product.find_or_create_by(
+ Product.find_or_create_by(
name: "Annual subscription",
- description: "An annual subscription gives you access to paid account features for one year. Does not auto-renew.",
+ description: "An annual subscription gives you access "\
+ "to paid account features for one year. Does not auto-renew.",
min_price: 3000,
account_type_id: @paid_account.id,
paid_months: 12
)
- Product.find_or_create_by(
+ Product.find_or_create_by(
name: "Seed account",
- description: "A seed account helps Growstuff grow in its early days. It gives you all the features of a paid account, in perpetuity. This account type never expires.",
+ description: "A seed account helps Growstuff grow in its "\
+ "early days. It gives you all the features of "\
+ "a paid account, in perpetuity. This account "\
+ "type never expires.",
min_price: 15000,
account_type_id: @seed_account.id,
)
@@ -153,7 +157,6 @@ namespace :growstuff do
desc "June 2013: replace nil account_types with free accounts"
task nil_account_type: :environment do
-
free = AccountType.find_by_name("Free")
raise "Free account type not found: run rake growstuff:oneoff:setup_shop"\
unless free
@@ -167,7 +170,6 @@ namespace :growstuff do
desc "July 2013: replace nil seed.tradable_to with nowhere"
task tradable_to_nowhere: :environment do
-
Seed.all.each do |s|
unless s.tradable_to
s.tradable_to = 'nowhere'
@@ -178,7 +180,6 @@ namespace :growstuff do
desc "August 2013: set up plantings_count cache on crop"
task reset_crop_plantings_count: :environment do
-
Crop.find_each do |c|
Crop.reset_counters c.id, :plantings
end
@@ -186,7 +187,6 @@ namespace :growstuff do
desc "August 2013: set default creator on existing crops"
task set_default_crop_creator: :environment do
-
cropbot = Member.find_by_login_name("cropbot")
raise "cropbot not found: create cropbot member on site or run rake db:seed" unless cropbot
cropbot.account.account_type = AccountType.find_by_name("Staff") # set this just because it's nice
@@ -203,7 +203,6 @@ namespace :growstuff do
sn.save
end
end
-
end
desc "August 2013: set planting owner"
@@ -329,5 +328,4 @@ namespace :growstuff do
Crop.import
end
end # end oneoff section
-
end
diff --git a/lib/tasks/hooks.rake b/lib/tasks/hooks.rake
index 93d599831..7543404b2 100644
--- a/lib/tasks/hooks.rake
+++ b/lib/tasks/hooks.rake
@@ -1,5 +1,5 @@
desc "Install git hooks"
task :hooks do
- FileUtils.symlink '../../script/pre-commit.sh', '.git/hooks/pre-commit',
- force: true
+ FileUtils.symlink '../../script/pre-commit.sh', '.git/hooks/pre-commit',
+ force: true
end
diff --git a/script/check_contributors_md b/script/check_contributors_md
index 131daf445..2bf2e6a4e 100755
--- a/script/check_contributors_md
+++ b/script/check_contributors_md
@@ -28,11 +28,10 @@ Please set it using
end
end
-if !system("grep #{author} CONTRIBUTORS.md") then
+unless system('grep', '-i', author, 'CONTRIBUTORS.md') then
abort %{
Thanks for your contribution, #{author}!
Please add your name and GitHub handle to the file CONTRIBUTORS.md,
commit it, and update your PR.
}
end
-
diff --git a/script/rails b/script/rails
index f8da2cffd..9092f9f3c 100755
--- a/script/rails
+++ b/script/rails
@@ -1,6 +1,7 @@
#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails"
+# with Rails 3 gems installed from the root of your application.
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require File.expand_path('../../config/boot', __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
require 'rails/commands'
diff --git a/spec/controllers/account_types_controller_spec.rb b/spec/controllers/account_types_controller_spec.rb
index eca67cfbc..633311b6e 100644
--- a/spec/controllers/account_types_controller_spec.rb
+++ b/spec/controllers/account_types_controller_spec.rb
@@ -1,28 +1,22 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe AccountTypesController do
-
# This automatically creates a "Free" account type
login_member(:admin_member)
def valid_attributes
{ "name" => "MyString" }
end
-
end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index d3ea69f87..da21a1ba3 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe AccountsController do
-
login_member(:admin_member)
def valid_attributes
@@ -32,5 +27,4 @@ describe AccountsController do
member = FactoryGirl.create(:member)
return member.account
end
-
end
diff --git a/spec/controllers/admin/orders_controller_spec.rb b/spec/controllers/admin/orders_controller_spec.rb
index 28fe0203a..4c407c34d 100644
--- a/spec/controllers/admin/orders_controller_spec.rb
+++ b/spec/controllers/admin/orders_controller_spec.rb
@@ -1,38 +1,31 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
-
require 'rails_helper'
describe Admin::OrdersController do
-
login_member(:admin_member)
describe "GET search" do
it "assigns @orders" do
order = FactoryGirl.create(:order)
- get :search, {search_by: 'order_id', search_text: order.id}
+ get :search, { search_by: 'order_id', search_text: order.id }
assigns(:orders).should eq([order])
end
it "sets an error message if nothing found" do
order = FactoryGirl.create(:order)
- get :search, {search_by: 'order_id', search_text: 'foo'}
+ get :search, { search_by: 'order_id', search_text: 'foo' }
flash[:alert].should match /Couldn't find order with/
end
end
-
end
diff --git a/spec/controllers/admin_controller_spec.rb b/spec/controllers/admin_controller_spec.rb
index d939b9f6b..0b36fe583 100644
--- a/spec/controllers/admin_controller_spec.rb
+++ b/spec/controllers/admin_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe AdminController do
-
login_member(:admin_member)
describe "GET admin/newsletter" do
diff --git a/spec/controllers/authentications_controller_spec.rb b/spec/controllers/authentications_controller_spec.rb
index e3dd39447..47be30487 100644
--- a/spec/controllers/authentications_controller_spec.rb
+++ b/spec/controllers/authentications_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe AuthenticationsController do
-
before(:each) do
@member = FactoryGirl.create(:member)
sign_in @member
@@ -30,5 +25,4 @@ describe AuthenticationsController do
'credentials' => { 'token' => 'blah', 'secret' => 'blah' }
}
end
-
end
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 3e60a642b..01d41e7b7 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe CommentsController do
-
before(:each) do
@member = FactoryGirl.create(:member)
sign_in @member
@@ -41,14 +36,14 @@ describe CommentsController do
describe "GET new" do
it "picks up post from params" do
post = FactoryGirl.create(:post)
- get :new, {post_id: post.id}
+ get :new, { post_id: post.id }
assigns(:post).should eq(post)
end
it "assigns the old comments as @comments" do
post = FactoryGirl.create(:post)
old_comment = FactoryGirl.create(:comment, post: post)
- get :new, {post_id: post.id}
+ get :new, { post_id: post.id }
assigns(:comments).should eq [old_comment]
end
@@ -63,7 +58,7 @@ describe CommentsController do
post = FactoryGirl.create(:post)
old_comment = FactoryGirl.create(:comment, post: post)
comment = FactoryGirl.create(:comment, post: post, author: @member)
- get :edit, {id: comment.to_param}
+ get :edit, { id: comment.to_param }
assigns(:comments).should eq([comment, old_comment])
end
end
@@ -72,7 +67,7 @@ describe CommentsController do
describe "with valid params" do
it "redirects to the comment's post" do
comment = Comment.create! valid_attributes
- put :update, {id: comment.to_param, comment: valid_attributes}
+ put :update, { id: comment.to_param, comment: valid_attributes }
response.should redirect_to(comment.post)
end
end
@@ -82,9 +77,8 @@ describe CommentsController do
it "redirects to the post the comment was on" do
comment = Comment.create! valid_attributes
post = comment.post
- delete :destroy, {id: comment.to_param}
+ delete :destroy, { id: comment.to_param }
response.should redirect_to(post)
end
end
-
end
diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb
index 894858057..9a0a1dcdc 100644
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe CropsController do
-
login_member(:crop_wrangling_member)
def valid_attributes
@@ -61,5 +56,4 @@ describe CropsController do
response.content_type.should eq("application/rss+xml")
end
end
-
end
diff --git a/spec/controllers/forums_controller_spec.rb b/spec/controllers/forums_controller_spec.rb
index 6d52321a5..f320204e2 100644
--- a/spec/controllers/forums_controller_spec.rb
+++ b/spec/controllers/forums_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe ForumsController do
-
login_member(:admin_member)
def valid_attributes
@@ -31,5 +26,4 @@ describe ForumsController do
def valid_session
{}
end
-
end
diff --git a/spec/controllers/gardens_controller_spec.rb b/spec/controllers/gardens_controller_spec.rb
index 4e9d0fc1c..790e1f8be 100644
--- a/spec/controllers/gardens_controller_spec.rb
+++ b/spec/controllers/gardens_controller_spec.rb
@@ -1,28 +1,22 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe GardensController do
-
login_member
def valid_attributes
member = FactoryGirl.create(:member)
- {name: 'My Garden', owner_id: member.id }
+ { name: 'My Garden', owner_id: member.id }
end
-
end
diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb
index 80822c564..b07f1c08a 100644
--- a/spec/controllers/harvests_controller_spec.rb
+++ b/spec/controllers/harvests_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe HarvestsController do
-
login_member
def valid_attributes
@@ -36,7 +31,7 @@ describe HarvestsController do
@maize = FactoryGirl.create(:maize)
@harvest1 = FactoryGirl.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
@harvest2 = FactoryGirl.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
- end
+ end
it "assigns all harvests as @harvests" do
get :index, {}
@@ -44,27 +39,27 @@ describe HarvestsController do
end
it "picks up owner from params and shows owner's harvests only" do
- get :index, {owner: @member1.slug}
+ get :index, { owner: @member1.slug }
assigns(:owner).should eq @member1
assigns(:harvests).should eq [@harvest1]
end
it "picks up crop from params and shows the harvests for the crop only" do
- get :index, {crop: @maize.name}
+ get :index, { crop: @maize.name }
assigns(:crop).should eq @maize
assigns(:harvests).should eq [@harvest2]
end
it "generates a csv" do
- get :index, {format: "csv"}
- response.status.should eq 200
+ get :index, { format: "csv" }
+ response.status.should eq 200
end
end
describe "GET show" do
it "assigns the requested harvest as @harvest" do
harvest = Harvest.create! valid_attributes
- get :show, {id: harvest.to_param}
+ get :show, { id: harvest.to_param }
assigns(:harvest).should eq(harvest)
end
end
@@ -79,7 +74,7 @@ describe HarvestsController do
describe "GET edit" do
it "assigns the requested harvest as @harvest" do
harvest = Harvest.create! valid_attributes
- get :edit, {id: harvest.to_param}
+ get :edit, { id: harvest.to_param }
assigns(:harvest).should eq(harvest)
end
end
@@ -88,18 +83,18 @@ describe HarvestsController do
describe "with valid params" do
it "creates a new Harvest" do
expect {
- post :create, {harvest: valid_attributes}
+ post :create, { harvest: valid_attributes }
}.to change(Harvest, :count).by(1)
end
it "assigns a newly created harvest as @harvest" do
- post :create, {harvest: valid_attributes}
+ post :create, { harvest: valid_attributes }
assigns(:harvest).should be_a(Harvest)
assigns(:harvest).should be_persisted
end
it "redirects to the created harvest" do
- post :create, {harvest: valid_attributes}
+ post :create, { harvest: valid_attributes }
response.should redirect_to(Harvest.last)
end
end
@@ -108,14 +103,14 @@ describe HarvestsController do
it "assigns a newly created but unsaved harvest as @harvest" do
# Trigger the behavior that occurs when invalid params are submitted
Harvest.any_instance.stub(:save).and_return(false)
- post :create, {harvest: { "crop_id" => "invalid value" }}
+ post :create, { harvest: { "crop_id" => "invalid value" } }
assigns(:harvest).should be_a_new(Harvest)
end
it "re-renders the 'new' template" do
# Trigger the behavior that occurs when invalid params are submitted
Harvest.any_instance.stub(:save).and_return(false)
- post :create, {harvest: { "crop_id" => "invalid value" }}
+ post :create, { harvest: { "crop_id" => "invalid value" } }
response.should render_template("new")
end
end
@@ -130,18 +125,18 @@ describe HarvestsController do
# receives the :update message with whatever params are
# submitted in the request.
Harvest.any_instance.should_receive(:update).with({ "crop_id" => "1" })
- put :update, {id: harvest.to_param, harvest: { "crop_id" => "1" }}
+ put :update, { id: harvest.to_param, harvest: { "crop_id" => "1" } }
end
it "assigns the requested harvest as @harvest" do
harvest = Harvest.create! valid_attributes
- put :update, {id: harvest.to_param, harvest: valid_attributes}
+ put :update, { id: harvest.to_param, harvest: valid_attributes }
assigns(:harvest).should eq(harvest)
end
it "redirects to the harvest" do
harvest = Harvest.create! valid_attributes
- put :update, {id: harvest.to_param, harvest: valid_attributes}
+ put :update, { id: harvest.to_param, harvest: valid_attributes }
response.should redirect_to(harvest)
end
end
@@ -151,7 +146,7 @@ describe HarvestsController do
harvest = Harvest.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
Harvest.any_instance.stub(:save).and_return(false)
- put :update, {id: harvest.to_param, harvest: { "crop_id" => "invalid value" }}
+ put :update, { id: harvest.to_param, harvest: { "crop_id" => "invalid value" } }
assigns(:harvest).should eq(harvest)
end
@@ -159,7 +154,7 @@ describe HarvestsController do
harvest = Harvest.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
Harvest.any_instance.stub(:save).and_return(false)
- put :update, {id: harvest.to_param, harvest: { "crop_id" => "invalid value" }}
+ put :update, { id: harvest.to_param, harvest: { "crop_id" => "invalid value" } }
response.should render_template("edit")
end
end
@@ -169,15 +164,14 @@ describe HarvestsController do
it "destroys the requested harvest" do
harvest = Harvest.create! valid_attributes
expect {
- delete :destroy, {id: harvest.to_param}
+ delete :destroy, { id: harvest.to_param }
}.to change(Harvest, :count).by(-1)
end
it "redirects to the harvests list" do
harvest = Harvest.create! valid_attributes
- delete :destroy, {id: harvest.to_param}
+ delete :destroy, { id: harvest.to_param }
response.should redirect_to(harvests_url)
end
end
-
end
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index 8d4aa3569..eb71e1f4a 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe HomeController do
-
describe "GET index" do
end
end
diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb
index be178341e..735a4c825 100644
--- a/spec/controllers/member_controller_spec.rb
+++ b/spec/controllers/member_controller_spec.rb
@@ -1,26 +1,21 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe MembersController do
-
before :each do
@member = FactoryGirl.create(:member)
- @posts = [ FactoryGirl.create(:post, author: @member) ]
+ @posts = [FactoryGirl.create(:post, author: @member)]
@twitter_auth = FactoryGirl.create(:authentication, member: @member)
@flickr_auth = FactoryGirl.create(:flickr_authentication, member: @member)
end
@@ -40,36 +35,34 @@ describe MembersController do
end
describe "GET show" do
-
it "provides JSON for member profile" do
- get :show, { id: @member.id , format: 'json' }
+ get :show, { id: @member.id, format: 'json' }
response.should be_success
end
it "assigns @posts with the member's posts" do
- get :show, {id: @member.id}
+ get :show, { id: @member.id }
assigns(:posts).should eq(@posts)
end
it "assigns @twitter_auth" do
- get :show, {id: @member.id}
+ get :show, { id: @member.id }
assigns(:twitter_auth).should eq(@twitter_auth)
end
it "assigns @flickr_auth" do
- get :show, {id: @member.id}
+ get :show, { id: @member.id }
assigns(:flickr_auth).should eq(@flickr_auth)
end
it "doesn't show completely nonsense members" do
- lambda { get :show, {id: 9999} }.should raise_error(ActiveRecord::RecordNotFound)
+ lambda { get :show, { id: 9999 } }.should raise_error(ActiveRecord::RecordNotFound)
end
it "doesn't show unconfirmed members" do
@member2 = FactoryGirl.create(:unconfirmed_member)
- lambda { get :show, {id: @member2.id} }.should raise_error(ActiveRecord::RecordNotFound)
+ lambda { get :show, { id: @member2.id } }.should raise_error(ActiveRecord::RecordNotFound)
end
-
end
describe "GET member's RSS feed" do
@@ -80,5 +73,4 @@ describe MembersController do
response.content_type.should eq("application/rss+xml")
end
end
-
end
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index de97919c3..2231edaad 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe NotificationsController do
-
login_member
def valid_attributes
@@ -56,14 +51,14 @@ describe NotificationsController do
describe "GET show" do
it "assigns the requested notification as @notification" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
- get :show, {id: notification.to_param}
+ get :show, { id: notification.to_param }
assigns(:notification).should eq(notification)
end
it "assigns the reply link for a post comment" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
- get :show, {id: notification.to_param}
+ get :show, { id: notification.to_param }
assigns(:reply_link).should_not be_nil
assigns(:reply_link).should eq new_comment_url(
post_id: notification.post.id
@@ -72,7 +67,7 @@ describe NotificationsController do
it "marks notifications as read" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
- get :show, {id: notification.to_param}
+ get :show, { id: notification.to_param }
# we need to fetch it from the db again, can't test against the old one
n = Notification.find(notification.id)
n.read.should eq true
@@ -82,7 +77,7 @@ describe NotificationsController do
describe "GET reply" do
it "marks notifications as read" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
- get :reply, {id: notification.to_param}
+ get :reply, { id: notification.to_param }
# we need to fetch it from the db again, can't test against the old one
n = Notification.find(notification.id)
n.read.should eq true
@@ -92,7 +87,7 @@ describe NotificationsController do
describe "GET new" do
it "assigns a recipient" do
@recipient = FactoryGirl.create(:member)
- get :new, {recipient_id: @recipient.id }
+ get :new, { recipient_id: @recipient.id }
assigns(:recipient).should be_an_instance_of(Member)
end
end
@@ -105,6 +100,5 @@ describe NotificationsController do
response.should redirect_to(notifications_path)
end
end
-
end
end
diff --git a/spec/controllers/order_items_controller_spec.rb b/spec/controllers/order_items_controller_spec.rb
index f081c85b7..d455cbe9b 100644
--- a/spec/controllers/order_items_controller_spec.rb
+++ b/spec/controllers/order_items_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe OrderItemsController do
-
login_member(:admin_member)
before(:each) do
@@ -33,14 +28,13 @@ describe OrderItemsController do
end
describe "POST create" do
-
it "redirects to order" do
@order = FactoryGirl.create(:order, member: @member)
- post :create, {order_item: {
+ post :create, { order_item: {
order_id: @order.id,
product_id: @product.id,
price: @product.min_price
- }}
+ } }
response.should redirect_to(OrderItem.last.order)
end
@@ -49,10 +43,10 @@ describe OrderItemsController do
sign_in @member
@product = FactoryGirl.create(:product)
expect {
- post :create, {order_item: {
+ post :create, { order_item: {
product_id: @product.id,
price: @product.min_price
- }}
+ } }
}.to change(Order, :count).by(1)
OrderItem.last.order.should be_an_instance_of Order
end
@@ -62,11 +56,11 @@ describe OrderItemsController do
@order = FactoryGirl.create(:order, member: @member)
@product = FactoryGirl.create(:product, min_price: 1)
expect {
- post :create, {order_item: {
+ post :create, { order_item: {
order_id: @order.id,
product_id: @product.id,
price: 3.33
- }}
+ } }
}.to change(OrderItem, :count).by(1)
OrderItem.last.price.should eq 333
end
diff --git a/spec/controllers/orders_controller_spec.rb b/spec/controllers/orders_controller_spec.rb
index 81e74a5b5..78bc0b99a 100644
--- a/spec/controllers/orders_controller_spec.rb
+++ b/spec/controllers/orders_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe OrdersController do
-
login_member(:admin_member)
def valid_attributes
@@ -33,7 +28,7 @@ describe OrdersController do
member = FactoryGirl.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
- get :checkout, {id: order.to_param, referral_code: 'FOOBAR'}
+ get :checkout, { id: order.to_param, referral_code: 'FOOBAR' }
order.reload
order.referral_code.should eq 'FOOBAR'
end
@@ -42,7 +37,7 @@ describe OrdersController do
member = FactoryGirl.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
- get :checkout, {id: order.to_param}
+ get :checkout, { id: order.to_param }
response.status.should eq 302
response.redirect_url.should match /paypal\.com/
end
@@ -53,7 +48,7 @@ describe OrdersController do
member = FactoryGirl.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
- get :complete, {id: order.to_param}
+ get :complete, { id: order.to_param }
assigns(:order).should eq(order)
end
end
@@ -63,9 +58,8 @@ describe OrdersController do
member = FactoryGirl.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
- delete :destroy, {id: order.id}
+ delete :destroy, { id: order.id }
response.should redirect_to(shop_url)
end
end
-
end
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index e73ba5317..0197e2009 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -1,23 +1,19 @@
+# frozen_string_literal: true
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe PhotosController do
-
login_member
def valid_attributes
@@ -53,152 +49,127 @@ describe PhotosController do
end
it "assigns a planting id" do
- get :new, { type: "planting", id: 5 }
+ get :new, type: "planting", id: 5
assigns(:id).should eq "5"
assigns(:type).should eq "planting"
+ expect(flash[:alert]).not_to be_present
end
it "assigns a harvest id" do
- get :new, { type: "harvest", id: 5 }
+ get :new, type: "harvest", id: 5
assigns(:id).should eq "5"
assigns(:type).should eq "harvest"
+ expect(flash[:alert]).not_to be_present
end
it "assigns a garden id" do
- get :new, { type: "garden", id: 5 }
+ get :new, type: "garden", id: 5
assigns(:id).should eq "5"
assigns(:type).should eq "garden"
+ expect(flash[:alert]).not_to be_present
end
it "assigns the current set as @current_set" do
- get :new, { set: 'foo' }
+ get :new, set: 'foo'
assigns(:current_set).should eq "foo"
+ expect(flash[:alert]).not_to be_present
end
-
end
describe "POST create" do
before(:each) do
- Photo.any_instance.stub(:flickr_metadata).and_return( {
- title: "A Heartbreaking work of staggering genius",
- license_name: "CC-BY",
- license_url: "http://example.com/aybpl",
- thumbnail_url: "http://example.com/thumb.jpg",
- fullsize_url: "http://example.com/full.jpg",
- link_url: "http://example.com"
- })
+ Photo.any_instance.stub(:flickr_metadata).and_return(title: "A Heartbreaking work of staggering genius",
+ license_name: "CC-BY",
+ license_url: "http://example.com/aybpl",
+ thumbnail_url: "http://example.com/thumb.jpg",
+ fullsize_url: "http://example.com/full.jpg",
+ link_url: "http://example.com")
end
+ let(:member) { FactoryGirl.create(:member) }
+ let(:garden) { FactoryGirl.create(:garden, owner: member) }
+ let(:planting) { FactoryGirl.create(:planting, garden: garden, owner: member) }
+ let(:harvest) { FactoryGirl.create(:harvest, owner: member) }
+ let(:photo) { FactoryGirl.create(:photo, owner: member) }
describe "with valid params" do
-
+ before { controller.stub(:current_member) { member } }
it "attaches the photo to a planting" do
- member = FactoryGirl.create(:member)
- controller.stub(:current_member) { member }
- garden = FactoryGirl.create(:garden, owner: member)
- planting = FactoryGirl.create(:planting, garden: garden, owner: member)
- photo = FactoryGirl.create(:photo, owner: member)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "planting",
- id: planting.id }
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
+ expect(flash[:alert]).not_to be_present
Photo.last.plantings.first.should eq planting
end
it "doesn't attach a photo to a planting twice" do
- member = FactoryGirl.create(:member)
- controller.stub(:current_member) { member }
- garden = FactoryGirl.create(:garden, owner: member)
- planting = FactoryGirl.create(:planting, garden: garden, owner: member)
- photo = FactoryGirl.create(:photo, owner: member)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "planting",
- id: planting.id }
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "planting",
- id: planting.id }
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
+ expect(flash[:alert]).not_to be_present
Photo.last.plantings.size.should eq 1
end
it "attaches the photo to a harvest" do
- member = FactoryGirl.create(:member)
- controller.stub(:current_member) { member }
- harvest = FactoryGirl.create(:harvest, owner: member)
- photo = FactoryGirl.create(:photo, owner: member)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "harvest",
- id: harvest.id }
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id
+ expect(flash[:alert]).not_to be_present
Photo.last.harvests.first.should eq harvest
end
it "doesn't attach a photo to a harvest twice" do
- member = FactoryGirl.create(:member)
- controller.stub(:current_member) { member }
- harvest = FactoryGirl.create(:harvest, owner: member)
- photo = FactoryGirl.create(:photo, owner: member)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "harvest",
- id: harvest.id }
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "harvest",
- id: harvest.id }
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id
+ expect(flash[:alert]).not_to be_present
Photo.last.harvests.size.should eq 1
+ end
+
+ it "doesn't attach photo to a comment" do
+ comment = FactoryGirl.create(:comment)
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id
+ expect(flash[:alert]).to be_present
+ end
end
- end
describe "for the second time" do
it "does not add a photo twice" do
- expect {
- post :create, {photo: { flickr_photo_id: 1 } }
- }.to change(Photo, :count).by(1)
- expect {
- post :create, {photo: { flickr_photo_id: 1 } }
- }.to change(Photo, :count).by(0)
+ expect do
+ post :create, photo: { flickr_photo_id: 1 }
+ end.to change(Photo, :count).by(1)
+ expect do
+ post :create, photo: { flickr_photo_id: 1 }
+ end.to change(Photo, :count).by(0)
end
end
describe "with matching owners" do
+ before { controller.stub(:current_member) { member } }
it "creates the planting/photo link" do
- member = FactoryGirl.create(:member)
- controller.stub(:current_member) { member }
- garden = FactoryGirl.create(:garden, owner: member)
planting = FactoryGirl.create(:planting, garden: garden, owner: member)
photo = FactoryGirl.create(:photo, owner: member)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "planting",
- id: planting.id }
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
+ expect(flash[:alert]).not_to be_present
Photo.last.plantings.first.should eq planting
end
it "creates the harvest/photo link" do
- member = FactoryGirl.create(:member)
- controller.stub(:current_member) { member }
- harvest = FactoryGirl.create(:harvest, owner: member)
- photo = FactoryGirl.create(:photo, owner: member)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "harvest",
- id: harvest.id }
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: harvest.id
+ expect(flash[:alert]).not_to be_present
Photo.last.harvests.first.should eq harvest
end
end
describe "with mismatched owners" do
- it "creates the planting/photo link" do
+ let(:photo) { FactoryGirl.create(:photo) }
+ it "does not create the planting/photo link" do
# members will be auto-created, and different
- planting = FactoryGirl.create(:planting)
- photo = FactoryGirl.create(:photo)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "planting",
- id: planting.id }
- Photo.last.plantings.first.should_not eq planting
+ another_planting = FactoryGirl.create(:planting)
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: another_planting.id
+ expect(flash[:alert]).to be_present
+ Photo.last.plantings.first.should_not eq another_planting
end
- it "creates the harvest/photo link" do
+ it "does not create the harvest/photo link" do
# members will be auto-created, and different
- harvest = FactoryGirl.create(:harvest)
- photo = FactoryGirl.create(:photo)
- post :create, {photo: { flickr_photo_id: photo.flickr_photo_id },
- type: "harvest",
- id: harvest.id }
- Photo.last.harvests.first.should_not eq harvest
+ another_harvest = FactoryGirl.create(:harvest)
+ post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: another_harvest.id
+ expect(flash[:alert]).to be_present
+ Photo.last.harvests.first.should_not eq another_harvest
end
end
end
diff --git a/spec/controllers/places_controller_spec.rb b/spec/controllers/places_controller_spec.rb
index 4c8c34d3c..e635d82b3 100644
--- a/spec/controllers/places_controller_spec.rb
+++ b/spec/controllers/places_controller_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe PlacesController do
@@ -36,7 +32,6 @@ describe PlacesController do
get :show, { place: @member_london.location }
assigns(:nearby_members).should eq [@member_london, @member_south_pole]
end
-
end
describe "GET search" do
diff --git a/spec/controllers/plant_parts_controller_spec.rb b/spec/controllers/plant_parts_controller_spec.rb
index 75b2ad53d..239422efa 100644
--- a/spec/controllers/plant_parts_controller_spec.rb
+++ b/spec/controllers/plant_parts_controller_spec.rb
@@ -1,21 +1,16 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe PlantPartsController do
-
end
diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb
index 68514b634..f51086114 100644
--- a/spec/controllers/plantings_controller_spec.rb
+++ b/spec/controllers/plantings_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe PlantingsController do
-
login_member
def valid_attributes
@@ -32,34 +27,33 @@ describe PlantingsController do
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@tomato = FactoryGirl.create(:tomato)
- @maize = FactoryGirl.create(:maize)
+ @maize = FactoryGirl.create(:maize)
@planting1 = FactoryGirl.create(:planting, crop: @tomato, owner: @member1)
@planting2 = FactoryGirl.create(:planting, crop: @maize, owner: @member2)
end
-
+
it "assigns all plantings as @plantings" do
get :index, {}
assigns(:plantings).should =~ [@planting1, @planting2]
end
it "picks up owner from params and shows owner's plantings only" do
- get :index, {owner: @member1.slug}
+ get :index, { owner: @member1.slug }
assigns(:owner).should eq @member1
assigns(:plantings).should eq [@planting1]
end
it "picks up crop from params and shows the plantings for the crop only" do
- get :index, {crop: @maize.name}
+ get :index, { crop: @maize.name }
assigns(:crop).should eq @maize
- assigns(:plantings).should eq [@planting2]
+ assigns(:plantings).should eq [@planting2]
end
end
describe "GET new" do
-
it "picks up crop from params" do
crop = FactoryGirl.create(:crop)
- get :new, {crop_id: crop.id}
+ get :new, { crop_id: crop.id }
assigns(:crop).should eq(crop)
end
@@ -71,7 +65,7 @@ describe PlantingsController do
it "picks up garden from params" do
member = FactoryGirl.create(:member)
garden = FactoryGirl.create(:garden, owner: member)
- get :new, {garden_id: garden.id}
+ get :new, { garden_id: garden.id }
assigns(:garden).should eq(garden)
end
@@ -89,7 +83,5 @@ describe PlantingsController do
post :create, { planting: valid_attributes }
assigns(:planting).owner.should eq subject.current_member
end
-
end
-
end
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index b53a67f40..1c26cfe12 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe PostsController do
-
login_member
def valid_attributes
@@ -43,5 +38,4 @@ describe PostsController do
response.content_type.should eq("application/rss+xml")
end
end
-
end
diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb
index f8ca75083..63c17aa66 100644
--- a/spec/controllers/products_controller_spec.rb
+++ b/spec/controllers/products_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe ProductsController do
-
login_member(:admin_member)
def valid_attributes
@@ -31,5 +26,4 @@ describe ProductsController do
def valid_session
{}
end
-
end
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index ac9990254..56d277b75 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe RegistrationsController do
-
before :each do
@member = FactoryGirl.create(:member)
sign_in @member
@@ -43,5 +38,4 @@ describe RegistrationsController do
assigns(:flickr_auth).should eq @auth
end
end
-
end
diff --git a/spec/controllers/robots_controller_spec.rb b/spec/controllers/robots_controller_spec.rb
index 16220cfe2..e8917aa29 100644
--- a/spec/controllers/robots_controller_spec.rb
+++ b/spec/controllers/robots_controller_spec.rb
@@ -6,7 +6,7 @@ describe RobotsController do
let(:staging_filename) { 'config/robots.staging.txt' }
before do
- @request.host = "#{ subdomain }.localhost.com"
+ @request.host = "#{subdomain}.localhost.com"
end
context 'subdomain is staging' do
diff --git a/spec/controllers/roles_controller_spec.rb b/spec/controllers/roles_controller_spec.rb
index 7a5e5fce8..f62289379 100644
--- a/spec/controllers/roles_controller_spec.rb
+++ b/spec/controllers/roles_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe RolesController do
-
def valid_attributes
{ "name" => "MyString" }
end
@@ -32,5 +27,4 @@ describe RolesController do
assigns(:roles).should eq([Role.find_by_name('admin'), role])
end
end
-
end
diff --git a/spec/controllers/scientific_names_controller_spec.rb b/spec/controllers/scientific_names_controller_spec.rb
index ab40494fb..db0c7baf7 100644
--- a/spec/controllers/scientific_names_controller_spec.rb
+++ b/spec/controllers/scientific_names_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe ScientificNamesController do
-
login_member(:crop_wrangling_member)
before(:each) do
@@ -33,6 +28,5 @@ describe ScientificNamesController do
get :new, { crop_id: 1 }
assigns(:crop).should be_an_instance_of Crop
end
-
end
end
diff --git a/spec/controllers/seeds_controller_spec.rb b/spec/controllers/seeds_controller_spec.rb
index bfb880477..b17a948c4 100644
--- a/spec/controllers/seeds_controller_spec.rb
+++ b/spec/controllers/seeds_controller_spec.rb
@@ -1,26 +1,22 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe SeedsController do
describe "GET index" do
it "picks up owner from params" do
owner = FactoryGirl.create(:member)
- get :index, {owner: owner.slug}
+ get :index, { owner: owner.slug }
assigns(:owner).should eq(owner)
end
end
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index a02d4fbad..82b07a4b4 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe ShopController do
-
before :each do
@product1 = FactoryGirl.create(:product)
@product2 = FactoryGirl.create(:product)
@@ -46,7 +41,5 @@ describe ShopController do
get :index, {}
assigns(:order).should eq @order
end
-
end
-
end
diff --git a/spec/custom_matchers.rb b/spec/custom_matchers.rb
index 6d52388bb..1cb9d61ab 100644
--- a/spec/custom_matchers.rb
+++ b/spec/custom_matchers.rb
@@ -1,6 +1,6 @@
require 'rspec/expectations'
-RSpec::Matchers.define :have_optional do | expected |
+RSpec::Matchers.define :have_optional do |expected|
match do |actual|
actual.has_selector? "#{expected} + span", text: '(Optional)'
end
diff --git a/spec/factories/account_types.rb b/spec/factories/account_types.rb
index 832ddf0ce..0187a9e3d 100644
--- a/spec/factories/account_types.rb
+++ b/spec/factories/account_types.rb
@@ -24,5 +24,4 @@ FactoryGirl.define do
is_permanent_paid true
end
end
-
end
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
index b1a88a7a6..85dca1b4c 100644
--- a/spec/factories/comments.rb
+++ b/spec/factories/comments.rb
@@ -2,7 +2,7 @@ FactoryGirl.define do
factory :comment do
post
author
- sequence(:body) { |n| "OMG LOL #{n}" } # because our commenters are more
- # polite than YouTube's
+ sequence(:body) { |n| "OMG LOL #{n}" }
+ # because our commenters are more polite than YouTube's
end
end
diff --git a/spec/factories/crop.rb b/spec/factories/crop.rb
index c2ba35046..6467cb813 100644
--- a/spec/factories/crop.rb
+++ b/spec/factories/crop.rb
@@ -1,5 +1,4 @@
FactoryGirl.define do
-
factory :crop do
name "magic bean"
en_wikipedia_url "http://en.wikipedia.org/wiki/Magic_bean"
@@ -54,12 +53,12 @@ FactoryGirl.define do
factory :uppercasecrop do
name "Swiss chard"
end
-
+
factory :autoloaded_crop do
creator "cropbot"
end
- #for testing crop request
+ # for testing crop request
factory :crop_request do
name "Ultra berry"
en_wikipedia_url ""
@@ -73,7 +72,5 @@ FactoryGirl.define do
approval_status "rejected"
reason_for_rejection "Totally fake"
end
-
end
-
end
diff --git a/spec/factories/follows.rb b/spec/factories/follows.rb
index 6de32b7a1..f54acc0e8 100644
--- a/spec/factories/follows.rb
+++ b/spec/factories/follows.rb
@@ -1,7 +1,6 @@
FactoryGirl.define do
factory :follow do
- follower
+ follower
followed
end
-
end
diff --git a/spec/factories/garden.rb b/spec/factories/garden.rb
index 8730c079c..8d6429e2a 100644
--- a/spec/factories/garden.rb
+++ b/spec/factories/garden.rb
@@ -20,6 +20,5 @@ FactoryGirl.define do
factory :garden_z do
name 'Zzzz this garden makes me sleepy'
end
-
end
end
diff --git a/spec/factories/member.rb b/spec/factories/member.rb
index b8b23a58a..7fb02594b 100644
--- a/spec/factories/member.rb
+++ b/spec/factories/member.rb
@@ -60,12 +60,12 @@ FactoryGirl.define do
end
factory :admin_member do
- roles { [ FactoryGirl.create(:admin) ] }
+ roles { [FactoryGirl.create(:admin)] }
end
factory :crop_wrangling_member do
- roles { [ FactoryGirl.create(:crop_wrangler) ] }
- sequence(:login_name) {|n| "wrangler#{n}"}
+ roles { [FactoryGirl.create(:crop_wrangler)] }
+ sequence(:login_name) { |n| "wrangler#{n}" }
end
factory :invalid_member_shortname do
@@ -103,7 +103,5 @@ FactoryGirl.define do
factory :no_email_notifications_member do
send_notification_email false
end
-
end
-
end
diff --git a/spec/factories/post.rb b/spec/factories/post.rb
index d9e6e0be5..562912214 100644
--- a/spec/factories/post.rb
+++ b/spec/factories/post.rb
@@ -1,5 +1,4 @@
FactoryGirl.define do
-
factory :post do
subject "A Post"
body "This is some text."
@@ -20,5 +19,4 @@ FactoryGirl.define do
forum
end
end
-
end
diff --git a/spec/factories/scientific_name.rb b/spec/factories/scientific_name.rb
index 43d9ad74a..9e053dbc9 100644
--- a/spec/factories/scientific_name.rb
+++ b/spec/factories/scientific_name.rb
@@ -13,6 +13,5 @@ FactoryGirl.define do
association :crop, factory: :tomato
scientific_name "Solanum lycopersicum"
end
-
end
end
diff --git a/spec/features/admin/forums_spec.rb b/spec/features/admin/forums_spec.rb
index a385289a6..1ff1398a4 100644
--- a/spec/features/admin/forums_spec.rb
+++ b/spec/features/admin/forums_spec.rb
@@ -4,7 +4,7 @@ feature "forums", js: true do
context "as an admin user" do
let(:member) { create :admin_member }
let(:forum) { create :forum }
-
+
background do
login_as member
end
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 0fc9bdb5a..ca24daf83 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -4,7 +4,7 @@ feature "products" do
context "admin user" do
let(:member) { create :admin_member }
let(:product) { create :product }
-
+
background do
login_as member
end
@@ -20,7 +20,8 @@ feature "products" do
click_link "New Product"
expect(current_path).to eq new_product_path
fill_in 'Name', with: 'Special offer'
- # note that failing to fill in a mandatory field has a messy error. This is not a priority defect but should be raised at some point.
+ # note that failing to fill in a mandatory field has a messy error.
+ # This is not a priority defect but should be raised at some point.
fill_in 'Minimum price', with: '150'
click_button 'Save'
expect(current_path).to eq product_path(Product.last)
diff --git a/spec/features/cms_spec.rb b/spec/features/cms_spec.rb
index ad10acd12..768806e59 100644
--- a/spec/features/cms_spec.rb
+++ b/spec/features/cms_spec.rb
@@ -23,4 +23,4 @@ feature "cms admin" do
visit comfy_admin_cms_path
expect(current_path).to match /#{comfy_admin_cms_path}/ # match any CMS admin page
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/comments/commenting_a_comment_spec.rb b/spec/features/comments/commenting_a_comment_spec.rb
index 49183c274..4d7c956bd 100644
--- a/spec/features/comments/commenting_a_comment_spec.rb
+++ b/spec/features/comments/commenting_a_comment_spec.rb
@@ -30,4 +30,4 @@ feature 'Commenting on a post' do
expect(page).to have_content "edited at"
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/crops/alternate_name_spec.rb b/spec/features/crops/alternate_name_spec.rb
index de8843708..319f4d7e1 100644
--- a/spec/features/crops/alternate_name_spec.rb
+++ b/spec/features/crops/alternate_name_spec.rb
@@ -42,7 +42,7 @@ feature "Alternate names", js: true do
scenario "Crop wranglers can delete alternate names" do
visit crop_path(alternate_eggplant.crop)
expect(page).to have_link "Delete",
- href: alternate_name_path(alternate_eggplant)
+ href: alternate_name_path(alternate_eggplant)
within('.alternate_names') { click_on "Delete" }
expect(page.status_code).to equal 200
expect(page).to_not have_content alternate_eggplant.name
@@ -52,7 +52,7 @@ feature "Alternate names", js: true do
scenario "Crop wranglers can add alternate names" do
visit crop_path(crop)
expect(page).to have_link "Add",
- href: new_alternate_name_path(crop_id: crop.id)
+ href: new_alternate_name_path(crop_id: crop.id)
within('.alternate_names') { click_on "Add" }
expect(page.status_code).to equal 200
expect(page).to have_css "option[value='#{crop.id}'][selected=selected]"
diff --git a/spec/features/crops/browse_crops_spec.rb b/spec/features/crops/browse_crops_spec.rb
index 1345d8738..72e63c8fd 100644
--- a/spec/features/crops/browse_crops_spec.rb
+++ b/spec/features/crops/browse_crops_spec.rb
@@ -1,10 +1,9 @@
require 'rails_helper'
feature "browse crops" do
-
let(:tomato) { create :tomato }
let(:maize) { create :maize }
- let(:pending_crop) { create :crop_request }
+ let(:pending_crop) { create :crop_request }
let(:rejected_crop) { create :rejected_crop }
scenario "has a form for sorting by" do
diff --git a/spec/features/crops/creating_a_crop_spec.rb b/spec/features/crops/creating_a_crop_spec.rb
index d234818b8..b97866fd8 100644
--- a/spec/features/crops/creating_a_crop_spec.rb
+++ b/spec/features/crops/creating_a_crop_spec.rb
@@ -31,4 +31,4 @@ feature "Crop - " do
expect(page).to have_content "Jasminum sambac 2"
expect(page).to have_content "Matsurika"
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb
index 09dd12c2f..cf2d3f502 100644
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
feature "crop detail page", js: true do
let(:crop) { create :crop }
-
+
subject { visit crop_path(crop) }
context "varieties" do
@@ -35,7 +35,6 @@ feature "crop detail page", js: true do
let!(:roma4) { create :crop, name: 'Roma tomato 4', parent: crop }
scenario "The crop has 4 varieties" do
-
subject
within ".varieties" do
@@ -52,7 +51,6 @@ feature "crop detail page", js: true do
subject
within ".varieties" do
-
# It lists the first 5 items (note: including the top level item.)
# It HAS have "Show all" toggle link but not "Show less" link
expect(page).to have_selector('li', text: /tomato/i, count: 5)
@@ -96,7 +94,6 @@ feature "crop detail page", js: true do
end
context "action buttons" do
-
background { subject }
scenario "has a link to plant the crop" do
@@ -108,40 +105,40 @@ feature "crop detail page", js: true do
scenario "has a link to add seeds" do
expect(page).to have_link "Add seeds to stash", href: new_seed_path(crop_id: crop.id)
end
-
end
context "SEO" do
-
background { subject }
scenario "has seed heading with SEO" do
- expect(page).to have_content "Find #{ crop.name } seeds"
+ expect(page).to have_content "Find #{crop.name} seeds"
end
scenario "has harvest heading with SEO" do
- expect(page).to have_content "#{ crop.name.capitalize } harvests"
+ expect(page).to have_content "#{crop.name.capitalize} harvests"
end
scenario "has planting heading with SEO" do
- expect(page).to have_content "See who's planted #{ crop.name.pluralize }"
+ expect(page).to have_content "See who's planted #{crop.name.pluralize}"
end
scenario "has planting advice with SEO" do
- expect(page).to have_content "How to grow #{ crop.name }"
+ expect(page).to have_content "How to grow #{crop.name}"
end
scenario "has a link to Wikipedia with SEO" do
- expect(page).to have_content "Learn more about #{ crop.name }"
+ expect(page).to have_content "Learn more about #{crop.name}"
expect(page).to have_link "Wikipedia (English)", href: crop.en_wikipedia_url
end
scenario "has a link to OpenFarm" do
- expect(page).to have_link "OpenFarm - Growing guide", href: "https://openfarm.cc/en/crops/#{URI.escape crop.name}"
+ expect(page).to have_link "OpenFarm - Growing guide",
+ href: "https://openfarm.cc/en/crops/#{URI.escape crop.name}"
end
scenario "has a link to gardenate" do
- expect(page).to have_link "Gardenate - Planting reminders", href: "http://www.gardenate.com/plant/#{URI.escape crop.name}"
+ expect(page).to have_link "Gardenate - Planting reminders",
+ href: "http://www.gardenate.com/plant/#{URI.escape crop.name}"
end
end
end
diff --git a/spec/features/crops/crop_wranglers_spec.rb b/spec/features/crops/crop_wranglers_spec.rb
index 620034fb2..817f01ae7 100644
--- a/spec/features/crops/crop_wranglers_spec.rb
+++ b/spec/features/crops/crop_wranglers_spec.rb
@@ -62,8 +62,6 @@ feature "crop wranglers", js: true do
visit crop_path(rejected_crop)
expect(page).to have_content "This crop was rejected for the following reason: Totally fake"
end
-
-
end
context "signed in non-wrangler" do
diff --git a/spec/features/footer_spec.rb b/spec/features/footer_spec.rb
index 8a2c21bbd..b7d109773 100644
--- a/spec/features/footer_spec.rb
+++ b/spec/features/footer_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
feature "footer", js: true do
-
before { visit root_path }
scenario "footer is on home page" do
@@ -12,6 +11,6 @@ feature "footer", js: true do
expect(page).to have_selector 'a[href="http://opendefinition.org/ossd/"]'
end
-# NB: not testing specific content in the footer since I'm going to put them
-# in the CMS and they'll be variable.
+ # NB: not testing specific content in the footer since I'm going to put them
+ # in the CMS and they'll be variable.
end
diff --git a/spec/features/gardens_spec.rb b/spec/features/gardens_spec.rb
index 90f2f9ed7..78a7c1285 100644
--- a/spec/features/gardens_spec.rb
+++ b/spec/features/gardens_spec.rb
@@ -46,7 +46,6 @@ feature "Planting a crop", js: true do
end
context "Clicking edit from the index page" do
-
background do
visit gardens_path
end
diff --git a/spec/features/harvests/browse_harvests_spec.rb b/spec/features/harvests/browse_harvests_spec.rb
index 28784d7a8..d103ec3c9 100644
--- a/spec/features/harvests/browse_harvests_spec.rb
+++ b/spec/features/harvests/browse_harvests_spec.rb
@@ -18,7 +18,6 @@ feature "browse harvests" do
scenario 'read more' do
expect(page).not_to have_link "Read more"
end
-
end
feature "filled in optional fields" do
diff --git a/spec/features/locale_spec.rb b/spec/features/locale_spec.rb
index 74cf208be..01d164f3c 100644
--- a/spec/features/locale_spec.rb
+++ b/spec/features/locale_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
feature "Changing locales", js: true do
-
after { I18n.locale = :en }
scenario "Locale can be set with a query param" do
diff --git a/spec/features/member_profile_spec.rb b/spec/features/member_profile_spec.rb
index 0551e3873..0c27c7be2 100644
--- a/spec/features/member_profile_spec.rb
+++ b/spec/features/member_profile_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
feature "member profile", js: true do
-
context "signed out member" do
let(:member) { create :member }
@@ -42,7 +41,6 @@ feature "member profile", js: true do
expect(page).not_to have_css("#membermap")
expect(page).not_to have_content "See other members"
end
-
end
context "email privacy" do
@@ -70,7 +68,6 @@ feature "member profile", js: true do
end
context "activity stats" do
-
scenario "with no activity" do
visit member_path(member)
expect(page).to have_content "Activity"
@@ -91,7 +88,6 @@ feature "member profile", js: true do
expect(page).to have_link "4 seeds", href: seeds_by_owner_path(owner: member)
expect(page).to have_link "5 posts", href: posts_by_author_path(author: member)
end
-
end
scenario "twitter link" do
diff --git a/spec/features/members_list_spec.rb b/spec/features/members_list_spec.rb
index 99e15820a..01b6ee8bd 100644
--- a/spec/features/members_list_spec.rb
+++ b/spec/features/members_list_spec.rb
@@ -27,4 +27,4 @@ feature "members list" do
expect(all_links.last).to have_text member1.login_name
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb
index 9949a619d..28436a3b2 100644
--- a/spec/features/notifications_spec.rb
+++ b/spec/features/notifications_spec.rb
@@ -7,10 +7,10 @@ feature "Notifications", :js do
context "On existing notification" do
let!(:notification) {
create :notification,
- sender: sender,
- recipient: recipient,
- body: "Notification body",
- post_id: nil
+ sender: sender,
+ recipient: recipient,
+ body: "Notification body",
+ post_id: nil
}
background do
@@ -49,4 +49,4 @@ feature "Notifications", :js do
expect(page).to have_selector 'tr', count: 5
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/photos/show_photo_spec.rb b/spec/features/photos/show_photo_spec.rb
index bf72f5fd6..ea3a20f14 100644
--- a/spec/features/photos/show_photo_spec.rb
+++ b/spec/features/photos/show_photo_spec.rb
@@ -39,4 +39,3 @@ feature "show photo page" do
end
end
end
-
diff --git a/spec/features/places/searching_a_place_spec.rb b/spec/features/places/searching_a_place_spec.rb
index e8562c244..10797d917 100644
--- a/spec/features/places/searching_a_place_spec.rb
+++ b/spec/features/places/searching_a_place_spec.rb
@@ -58,4 +58,4 @@ feature "User searches" do
fill_in "new_place", with: search_string
click_button "search_button"
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb
index 4cba3cb51..3b407c3df 100644
--- a/spec/features/planting_reminder_spec.rb
+++ b/spec/features/planting_reminder_spec.rb
@@ -5,7 +5,7 @@ feature "Planting reminder email", :js do
let(:member) { create :member }
let(:mail) { Notifier.planting_reminder(member) }
- # Unfortunately, we can't use the default url options for ActionMailer as configured in
+ # Unfortunately, we can't use the default url options for ActionMailer as configured in
# test.rb, since this isn't a mailer spec.
def self.default_url_options
{ host: 'localhost', port: 8080 }
diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb
index 7c51af70f..2494e7e41 100644
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -191,12 +191,12 @@ feature "Planting a crop", :js do
fill_in "Finished date", with: "2014-08-30"
# Trigger click instead of using Capybara"s uncheck
- # because a date selection widget is overlapping
+ # because a date selection widget is overlapping
# the checkbox preventing interaction.
find("#planting_finished").trigger 'click'
end
- # Javascript removes the finished at date when the
+ # Javascript removes the finished at date when the
# planting is marked unfinished.
expect(find("#planting_finished_at").value).to eq("")
@@ -204,7 +204,7 @@ feature "Planting a crop", :js do
find("#planting_finished").trigger 'click'
end
- # The finished at date was cached in Javascript in
+ # The finished at date was cached in Javascript in
# case the user clicks unfinished accidentally.
expect(find("#planting_finished_at").value).to eq("2014-08-30")
@@ -272,8 +272,7 @@ feature "Planting a crop", :js do
describe "Marking a planting as finished from the list page" do
let(:path) { plantings_path }
let(:link_text) { "Mark as finished" }
-
+
it_behaves_like "append date"
end
end
-
diff --git a/spec/features/rss/plantings_spec.rb b/spec/features/rss/plantings_spec.rb
index effad2969..59833eff1 100644
--- a/spec/features/rss/plantings_spec.rb
+++ b/spec/features/rss/plantings_spec.rb
@@ -8,6 +8,7 @@ feature 'Plantings RSS feed' do
scenario 'The index title is what we expect' do
visit plantings_path(format: 'rss')
- expect(page).to have_content "Recent plantings from #{ @owner ? @owner : 'all members' } (#{ENV['GROWSTUFF_SITE_NAME']})"
+ expect(page).to have_content "Recent plantings from "\
+ "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
end
end
diff --git a/spec/features/rss/posts_spec.rb b/spec/features/rss/posts_spec.rb
index 2d900ebe4..445a50cca 100644
--- a/spec/features/rss/posts_spec.rb
+++ b/spec/features/rss/posts_spec.rb
@@ -8,6 +8,7 @@ feature 'Posts RSS feed' do
scenario 'The index title is what we expect' do
visit posts_path(format: 'rss')
- expect(page).to have_content "Recent posts from #{ @author ? @author : 'all members' } (#{ENV['GROWSTUFF_SITE_NAME']})"
+ expect(page).to have_content "Recent posts from "\
+ "#{@author ? @author : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
end
end
diff --git a/spec/features/rss/seeds_spec.rb b/spec/features/rss/seeds_spec.rb
index 7e5320655..888cc42ec 100644
--- a/spec/features/rss/seeds_spec.rb
+++ b/spec/features/rss/seeds_spec.rb
@@ -8,6 +8,7 @@ feature 'Seeds RSS feed' do
scenario 'The index title is what we expect' do
visit seeds_path(format: 'rss')
- expect(page).to have_content "Recent seeds from #{ @owner ? @owner : 'all members' } (#{ENV['GROWSTUFF_SITE_NAME']})"
+ expect(page).to have_content "Recent seeds from "\
+ "#{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
end
end
diff --git a/spec/features/scientific_name_spec.rb b/spec/features/scientific_name_spec.rb
index c5b621e10..c55cf6428 100644
--- a/spec/features/scientific_name_spec.rb
+++ b/spec/features/scientific_name_spec.rb
@@ -42,7 +42,7 @@ feature "Scientific names", js: true do
scenario "Crop wranglers can delete scientific names" do
visit crop_path(zea_mays.crop)
expect(page).to have_link "Delete",
- href: scientific_name_path(zea_mays)
+ href: scientific_name_path(zea_mays)
within('.scientific_names') { click_on "Delete" }
expect(page.status_code).to equal 200
expect(page).to_not have_content zea_mays.scientific_name
@@ -52,7 +52,7 @@ feature "Scientific names", js: true do
scenario "Crop wranglers can add scientific names" do
visit crop_path(crop)
expect(page).to have_link "Add",
- href: new_scientific_name_path(crop_id: crop.id)
+ href: new_scientific_name_path(crop_id: crop.id)
within('.scientific_names') { click_on "Add" }
expect(page.status_code).to equal 200
expect(page).to have_css "option[value='#{crop.id}'][selected=selected]"
@@ -67,7 +67,7 @@ feature "Scientific names", js: true do
visit scientific_name_path(zea_mays)
expect(page.status_code).to equal 200
expect(page).to have_link zea_mays.crop.name,
- href: crop_path(zea_mays.crop)
+ href: crop_path(zea_mays.crop)
end
context "When scientific name is pending" do
diff --git a/spec/features/shared_examples/append_date.rb b/spec/features/shared_examples/append_date.rb
index 310e39606..3457663e6 100644
--- a/spec/features/shared_examples/append_date.rb
+++ b/spec/features/shared_examples/append_date.rb
@@ -18,4 +18,4 @@ shared_examples "append date" do
click_link "Confirm without date"
expect(page).to have_content("Finished: Yes (no date specified) ")
end
-end
\ No newline at end of file
+end
diff --git a/spec/features/signin_spec.rb b/spec/features/signin_spec.rb
index 2000d29e1..41aa1ecd1 100644
--- a/spec/features/signin_spec.rb
+++ b/spec/features/signin_spec.rb
@@ -1,6 +1,5 @@
require 'rails_helper'
-
feature "signin", js: true do
let(:member) { create :member }
let(:recipient) { create :member }
@@ -63,20 +62,20 @@ feature "signin", js: true do
end
context "with facebook" do
- scenario "sign in" do
+ scenario "sign in" do
# Ordinarily done by database_cleaner
Member.where(login_name: 'tdawg').delete_all
member = create :member, login_name: 'tdawg', email: 'example.oauth.facebook@example.com'
# Start the test
- visit root_path
+ visit root_path
first('.signup a').click
# Click the signup with facebook link
first('a[href="/members/auth/facebook"]').click
- # Magic happens!
+ # Magic happens!
# See config/environments/test.rb for the fake user
# that we pretended to auth as
diff --git a/spec/features/signout_spec.rb b/spec/features/signout_spec.rb
index 2d5d1a230..433286078 100644
--- a/spec/features/signout_spec.rb
+++ b/spec/features/signout_spec.rb
@@ -26,5 +26,4 @@ feature "signout" do
expect(current_path).to eq new_member_session_path
end
end
-
end
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index 8f3ad45b3..6afb28119 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
feature "signup", js: true do
-
scenario "sign up for new account from top menubar" do
visit crops_path # something other than front page, which has multiple signup links
click_link 'Sign up'
@@ -34,7 +33,7 @@ feature "signup", js: true do
end
scenario "sign up for new account without accepting TOS" do
- visit root_path
+ visit root_path
first('.signup a').click # click the 'Sign up' button in the middle of the page
fill_in 'Login name', with: 'person123'
fill_in 'Email', with: 'gardener@example.com'
@@ -54,13 +53,13 @@ feature "signup", js: true do
Authentication.where(provider: 'facebook', uid: '123545').delete_all
# Start the test
- visit root_path
+ visit root_path
first('.signup a').click
# Click the signup with facebook link
first('a[href="/members/auth/facebook"]').click
- # Magic happens!
+ # Magic happens!
# See config/environments/test.rb for the fake user
# that we pretended to auth as
diff --git a/spec/features/unsubscribing_spec.rb b/spec/features/unsubscribing_spec.rb
index 4b4981ad9..ba231d1d8 100644
--- a/spec/features/unsubscribing_spec.rb
+++ b/spec/features/unsubscribing_spec.rb
@@ -56,4 +56,4 @@ feature "unsubscribe" do
expect(member.send_planting_reminder).to eq(true)
expect(member.send_notification_email).to eq(true)
end
-end
\ No newline at end of file
+end
diff --git a/spec/helpers/crops_helper_spec.rb b/spec/helpers/crops_helper_spec.rb
index ff4b753bf..49a570836 100644
--- a/spec/helpers/crops_helper_spec.rb
+++ b/spec/helpers/crops_helper_spec.rb
@@ -19,14 +19,16 @@ describe CropsHelper do
end
it 'should render' do
- expect(helper.display_seed_availability(@member, @crop)).to eq "You have an unknown quantity of seeds of this crop."
+ expect(
+ helper.display_seed_availability(@member, @crop)
+ ).to eq "You have an unknown quantity of seeds of this crop."
end
end
context "with an quantity of seeds" do
before do
a_different_crop = create :apple
-
+
create :seed, crop: @crop, quantity: 20, owner: @member
create :seed, crop: @crop, quantity: 13, owner: @member
diff --git a/spec/helpers/harvests_helper_spec.rb b/spec/helpers/harvests_helper_spec.rb
index c65d8b36e..15cafc9c5 100644
--- a/spec/helpers/harvests_helper_spec.rb
+++ b/spec/helpers/harvests_helper_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
describe HarvestsHelper do
describe "display_quantity" do
-
it "blank" do
harvest = FactoryGirl.create(:harvest,
quantity: nil,
@@ -74,6 +73,5 @@ describe HarvestsHelper do
result = helper.display_quantity(harvest)
result.should eq '3 bunches, weighing 3 kg'
end
-
end
end
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index 109bf0c87..d79ea409d 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -2,8 +2,7 @@ require 'rails_helper'
describe NotificationsHelper do
describe "reply_link" do
-
- let(:member) { FactoryGirl.create(:member) }
+ let(:member) { FactoryGirl.create(:member) }
it "replies to PMs with PMs" do
notification = FactoryGirl.create(:notification, recipient_id: member.id, post_id: nil)
@@ -23,7 +22,5 @@ describe NotificationsHelper do
post_id: notification.post.id
)
end
-
-
end
end
diff --git a/spec/helpers/plantings_helper_spec.rb b/spec/helpers/plantings_helper_spec.rb
index ae8c78c78..9485af81d 100644
--- a/spec/helpers/plantings_helper_spec.rb
+++ b/spec/helpers/plantings_helper_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
describe PlantingsHelper do
describe "display_planting" do
-
let!(:member) { FactoryGirl.build(:member, login_name: 'crop_lady') }
it "does not have a quantity nor a planted from value provided" do
@@ -67,8 +66,6 @@ describe PlantingsHelper do
result = helper.display_planting(planting)
expect(result).to eq "crop_lady planted 1 seed."
end
-
end
-
end
-end
\ No newline at end of file
+end
diff --git a/spec/lib/actions/oauth_signup_action_spec.rb b/spec/lib/actions/oauth_signup_action_spec.rb
index 2495368dd..4bb4f74bb 100644
--- a/spec/lib/actions/oauth_signup_action_spec.rb
+++ b/spec/lib/actions/oauth_signup_action_spec.rb
@@ -9,26 +9,26 @@ describe 'Growstuff::OauthSignupAction' do
context 'with a valid authentication' do
before :each do
@auth = OmniAuth::AuthHash.new({
- 'provider' => 'facebook',
- 'uid' => '123545',
- 'info' => {
- 'name' => "John Testerson's Brother",
- 'nickname' => 'JohnnyB',
- 'email' => 'example.oauth.facebook@example.com',
- 'image' => 'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
- },
- 'credentials' => {
- 'token' => "token",
- 'secret' => "donttell"
- }
- })
+ 'provider' => 'facebook',
+ 'uid' => '123545',
+ 'info' => {
+ 'name' => "John Testerson's Brother",
+ 'nickname' => 'JohnnyB',
+ 'email' => 'example.oauth.facebook@example.com',
+ 'image' => 'http://findicons.com/files/icons/1072/face_avatars/300/i04.png'
+ },
+ 'credentials' => {
+ 'token' => "token",
+ 'secret' => "donttell"
+ }
+ })
end
context 'no existing user' do
before :each do
@auth['info']['email'] = 'no.existing.user@gmail.com'
- Member.where(email: @auth['info']['email']).delete_all
+ Member.where(email: @auth['info']['email']).delete_all
@member = @action.find_or_create_from_authorization(@auth)
@authentication = @action.establish_authentication(@auth, @member)
@@ -66,7 +66,7 @@ describe 'Growstuff::OauthSignupAction' do
it 'should store the uid and provider for the member' do
expect(@authentication.member.id).to eq @member.id
expect(@authentication.provider).to eq 'facebook'
- expect(@authentication.uid).to eq '123545'
+ expect(@authentication.uid).to eq '123545'
end
end
@@ -77,7 +77,7 @@ describe 'Growstuff::OauthSignupAction' do
Member.where(email: @auth['info']['email']).delete_all
@existing_member = create :member, {
- email: @auth['info']['email'],
+ email: @auth['info']['email'],
login_name: 'existing',
preferred_avatar_uri: 'http://cl.jroo.me/z3/W/H/K/e/a.baa-very-cool-hat-you-.jpg'
}
@@ -111,7 +111,7 @@ describe 'Growstuff::OauthSignupAction' do
it 'should store the uid and provider for the member' do
expect(@authentication.member.id).to eq @member.id
expect(@authentication.provider).to eq 'facebook'
- expect(@authentication.uid).to eq '123545'
+ expect(@authentication.uid).to eq '123545'
end
end
@@ -123,17 +123,17 @@ describe 'Growstuff::OauthSignupAction' do
Authentication.delete_all
@existing_member = create :member, {
- email: @auth['info']['email'],
+ email: @auth['info']['email'],
login_name: 'schrodingerscat',
preferred_avatar_uri: 'http://cl.jroo.me/z3/W/H/K/e/a.baa-very-cool-hat-you-.jpg'
}
@existing_authentication = @existing_member.authentications.create({
- provider: 'facebook',
- uid: '123545',
- name: "John Testerson's Brother",
- member_id: @existing_member.id
- })
+ provider: 'facebook',
+ uid: '123545',
+ name: "John Testerson's Brother",
+ member_id: @existing_member.id
+ })
@member = @action.find_or_create_from_authorization(@auth)
@authentication = @action.establish_authentication(@auth, @member)
@@ -168,4 +168,4 @@ describe 'Growstuff::OauthSignupAction' do
end
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/lib/haml/filters/escaped_markdown_spec.rb b/spec/lib/haml/filters/escaped_markdown_spec.rb
index 60066160f..23f275f96 100644
--- a/spec/lib/haml/filters/escaped_markdown_spec.rb
+++ b/spec/lib/haml/filters/escaped_markdown_spec.rb
@@ -19,5 +19,4 @@ describe 'Haml::Filters::Escaped_Markdown' do
rendered = Haml::Filters::EscapedMarkdown.render("[#{@crop.name}](crop)")
rendered.should match /<a href="/
end
-
end
diff --git a/spec/lib/haml/filters/growstuff_markdown_spec.rb b/spec/lib/haml/filters/growstuff_markdown_spec.rb
index 2aba8fb89..debce3111 100644
--- a/spec/lib/haml/filters/growstuff_markdown_spec.rb
+++ b/spec/lib/haml/filters/growstuff_markdown_spec.rb
@@ -6,7 +6,7 @@ def input_link(name)
return "[#{name}](crop)"
end
-def output_link(crop, name=nil)
+def output_link(crop, name = nil)
url = Rails.application.routes.url_helpers.crop_url(crop, host: Growstuff::Application.config.host)
if name
return "#{name}"
@@ -19,7 +19,7 @@ def input_member_link(name)
return "[#{name}](member)"
end
-def output_member_link(member, name=nil)
+def output_member_link(member, name = nil)
url = Rails.application.routes.url_helpers.member_url(member, only_path: true)
if name
return "#{name}"
@@ -28,12 +28,11 @@ def output_member_link(member, name=nil)
end
end
-
describe 'Haml::Filters::Growstuff_Markdown' do
- it 'is registered as the handler for :growstuff_markdown' do
- Haml::Filters::defined['growstuff_markdown'].should ==
- Haml::Filters::GrowstuffMarkdown
- end
+ it 'is registered as the handler for :growstuff_markdown' do
+ Haml::Filters::defined['growstuff_markdown'].should ==
+ Haml::Filters::GrowstuffMarkdown
+ end
it 'converts quick crop links' do
@crop = FactoryGirl.create(:crop)
@@ -48,7 +47,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
it "doesn't convert escaped crop links" do
@crop = FactoryGirl.create(:crop)
- rendered = Haml::Filters::GrowstuffMarkdown.render( "\\" << input_link(@crop.name))
+ rendered = Haml::Filters::GrowstuffMarkdown.render("\\" << input_link(@crop.name))
rendered.should match /\[#{@crop.name}\]\(crop\)/
end
@@ -97,7 +96,6 @@ describe 'Haml::Filters::Growstuff_Markdown' do
rendered.should match /\[#{@member.login_name}\]\(member\)/
end
-
it 'converts @ member links' do
@member = FactoryGirl.create(:member)
rendered = Haml::Filters::GrowstuffMarkdown.render("Hey @#{@member.login_name}! What's up")
@@ -122,5 +120,4 @@ describe 'Haml::Filters::Growstuff_Markdown' do
rendered = Haml::Filters::GrowstuffMarkdown.render("Hey \\@#{@member.login_name}! What's up")
rendered.should match /Hey @#{@member.login_name}!/
end
-
end
diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb
index ce552f99b..c766528b7 100644
--- a/spec/mailers/notifier_spec.rb
+++ b/spec/mailers/notifier_spec.rb
@@ -1,7 +1,6 @@
require "rails_helper"
describe Notifier do
-
describe "notifications" do
let(:notification) { FactoryGirl.create(:notification) }
let(:mail) { Notifier.notify(notification) }
@@ -42,10 +41,8 @@ describe Notifier do
it 'includes the new harvest URL' do
mail.body.encoded.should match new_harvest_path
end
-
end
-
describe "new crop request" do
let(:member) { FactoryGirl.create(:crop_wrangling_member) }
let(:crop) { FactoryGirl.create(:crop_request) }
@@ -94,7 +91,6 @@ describe Notifier do
expect(mail.body.encoded).to match "#{new_harvest_url}\\?crop_id=#{crop.id}"
expect(mail.body.encoded).to match "#{new_seed_url}\\?crop_id=#{crop.id}"
end
-
end
describe "crop rejected" do
@@ -122,6 +118,4 @@ describe Notifier do
expect(mail.body.encoded).to match "Totally fake"
end
end
-
-
end
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index f31f7f845..4bb68c674 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -2,12 +2,10 @@ require 'rails_helper'
require 'cancan/matchers'
describe Ability do
-
let(:member) { FactoryGirl.create(:member) }
let(:ability) { Ability.new(member) }
context "notifications" do
-
it 'member can view their own notifications' do
notification = FactoryGirl.create(:notification, recipient: member)
ability.should be_able_to(:read, notification)
@@ -38,7 +36,6 @@ describe Ability do
end
context "crop wrangling" do
-
let(:crop) { FactoryGirl.create(:crop) }
context "standard member" do
@@ -57,7 +54,6 @@ describe Ability do
end
context "crop wrangler" do
-
let(:role) { FactoryGirl.create(:crop_wrangler) }
before(:each) do
@@ -81,7 +77,6 @@ describe Ability do
end
context "products" do
-
let(:product) { FactoryGirl.create(:product) }
context "standard member" do
@@ -91,11 +86,9 @@ describe Ability do
ability.should_not be_able_to(:update, product)
ability.should_not be_able_to(:destroy, product)
end
-
end
context "admin" do
-
let(:role) { FactoryGirl.create(:admin) }
before do
@@ -122,17 +115,16 @@ describe Ability do
end
context "orders" do
-
let(:order) { FactoryGirl.create(:order, member: member) }
let(:strangers_order) { FactoryGirl.create(:order,
- member: FactoryGirl.create(:member)) }
+ member: FactoryGirl.create(:member)) }
let(:completed_order) { FactoryGirl.create(:completed_order,
- member: member) }
+ member: member) }
let(:order_item) { FactoryGirl.create(:order_item, order: order) }
let(:strangers_order_item) { FactoryGirl.create(:order_item,
- order: strangers_order) }
+ order: strangers_order) }
let(:completed_order_item) { FactoryGirl.create(:order_item,
- order: completed_order) }
+ order: completed_order) }
context "standard member" do
it "can read their own orders" do
@@ -208,12 +200,9 @@ describe Ability do
it "can't delete items from completed orders" do
ability.should_not be_able_to(:destroy, completed_order_item)
end
-
-
end
context "admin" do
-
let(:role) { FactoryGirl.create(:admin) }
before do
@@ -239,12 +228,10 @@ describe Ability do
it "cannot delete orders" do
ability.should_not be_able_to(:destroy, order)
end
-
end
end
context 'account details' do
-
let(:account) { member.account }
context 'ordinary member' do
@@ -259,10 +246,9 @@ describe Ability do
end
context 'admin' do
-
let(:role) { FactoryGirl.create(:admin) }
- before do
+ before do
member.roles << role
end
@@ -274,13 +260,10 @@ describe Ability do
ability.should be_able_to(:update, account)
ability.should be_able_to(:destroy, account)
end
-
end
-
end
context 'plant parts' do
-
let(:plant_part) { FactoryGirl.create(:plant_part) }
context 'ordinary member' do
@@ -295,9 +278,8 @@ describe Ability do
end
context 'admin' do
-
let(:role) { FactoryGirl.create(:admin) }
-
+
before do
member.roles << role
end
@@ -318,8 +300,6 @@ describe Ability do
@harvest = FactoryGirl.create(:harvest, plant_part: plant_part)
ability.should_not be_able_to(:destroy, plant_part)
end
-
end
end
-
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 1274a825e..52caf725f 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Account do
-
let(:member) { FactoryGirl.create(:member) }
it "auto-creates an account detail record when a member is created" do
@@ -25,5 +24,4 @@ describe Account do
member.account.paid_until = @time
member.account.paid_until_string.should eq @time.to_s
end
-
end
diff --git a/spec/models/alternate_name_spec.rb b/spec/models/alternate_name_spec.rb
index 5e12b02de..ec5684bcb 100644
--- a/spec/models/alternate_name_spec.rb
+++ b/spec/models/alternate_name_spec.rb
@@ -18,5 +18,4 @@ describe AlternateName do
expect(crop.alternate_names).to include an
expect(crop.alternate_names).to include an2
end
-
end
diff --git a/spec/models/authentication_spec.rb b/spec/models/authentication_spec.rb
index 0159361ff..10f6ac3d6 100644
--- a/spec/models/authentication_spec.rb
+++ b/spec/models/authentication_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Authentication do
-
it 'creates an authentication' do
@auth = FactoryGirl.create(:authentication)
@auth.should be_an_instance_of Authentication
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index f3c94860e..0badd5be6 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -1,9 +1,7 @@
require 'rails_helper'
describe Comment do
-
context "basic" do
-
let(:comment) { FactoryGirl.create(:comment) }
it "belongs to a post" do
@@ -16,7 +14,6 @@ describe Comment do
end
context "notifications" do
-
let(:comment) { FactoryGirl.create(:comment) }
it "sends a notification when a comment is posted" do
@@ -60,5 +57,4 @@ describe Comment do
Comment.post_order.should eq [@c1, @c2]
end
end
-
end
diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb
index c7aaa0d77..675a90a7f 100644
--- a/spec/models/crop_spec.rb
+++ b/spec/models/crop_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
describe Crop do
context 'all fields present' do
-
let(:crop) { FactoryGirl.create(:tomato) }
it 'should save a basic crop' do
@@ -51,7 +50,6 @@ describe Crop do
end
context 'popularity' do
-
let(:tomato) { FactoryGirl.create(:tomato) }
let(:maize) { FactoryGirl.create(:maize) }
let(:cucumber) { FactoryGirl.create(:crop, name: 'cucumber') }
@@ -66,7 +64,6 @@ describe Crop do
FactoryGirl.create_list(:planting, 10, crop: tomato)
Crop.popular.first.should eq tomato
end
-
end
it 'finds a default scientific name' do
@@ -85,11 +82,43 @@ describe Crop do
@crop.plantings.size.should eq 1
end
- it 'validates en_wikipedia_url' do
- @crop = FactoryGirl.build(:tomato, en_wikipedia_url: 'this is not valid')
- @crop.should_not be_valid
- @crop = FactoryGirl.build(:tomato, en_wikipedia_url: 'http://en.wikipedia.org/wiki/SomePage')
- @crop.should be_valid
+ context "wikipedia url" do
+ subject { FactoryGirl.build(:tomato, en_wikipedia_url: wikipedia_url) }
+
+ context 'not a url' do
+ let(:wikipedia_url) { 'this is not valid' }
+ it { expect(subject).not_to be_valid }
+ end
+
+ context 'http url' do
+ let(:wikipedia_url) { 'http://en.wikipedia.org/wiki/SomePage' }
+ it { expect(subject).to be_valid }
+ end
+
+ context 'with ssl' do
+ let(:wikipedia_url) { 'https://en.wikipedia.org/wiki/SomePage' }
+ it { expect(subject).to be_valid }
+ end
+
+ context 'with utf8 macrons' do
+ let(:wikipedia_url) { 'https://en.wikipedia.org/wiki/Māori' }
+ it { expect(subject).to be_valid }
+ end
+
+ context 'urlencoded' do
+ let(:wikipedia_url) { 'https://en.wikipedia.org/wiki/M%C4%81ori' }
+ it { expect(subject).to be_valid }
+ end
+
+ context 'with new lines in url' do
+ let(:wikipedia_url) { 'http://en.wikipedia.org/wiki/SomePage\n\nBrendaRocks' }
+ it { expect(subject).not_to be_valid }
+ end
+
+ context "with script tags in url" do
+ let(:wikipedia_url) { 'http://en.wikipedia.org/wiki/SomePage' }
+ it { expect(subject).not_to be_valid }
+ end
end
context 'varieties' do
@@ -103,7 +132,7 @@ describe Crop do
it 'toplevel scope works' do
@tomato = FactoryGirl.create(:tomato)
@roma = FactoryGirl.create(:roma, parent_id: @tomato.id)
- Crop.toplevel.should eq [ @tomato ]
+ Crop.toplevel.should eq [@tomato]
end
end
@@ -149,7 +178,6 @@ describe Crop do
end
end
-
context 'with no plantings or harvests' do
it 'has no default photo' do
@crop.default_photo.should eq nil
@@ -158,7 +186,6 @@ describe Crop do
end
context 'sunniness' do
-
let(:crop) { FactoryGirl.create(:tomato) }
it 'returns a hash of sunniness values' do
@@ -186,7 +213,6 @@ describe Crop do
end
context 'planted_from' do
-
let(:crop) { FactoryGirl.create(:tomato) }
it 'returns a hash of sunniness values' do
@@ -214,7 +240,6 @@ describe Crop do
end
context 'popular plant parts' do
-
let(:crop) { FactoryGirl.create(:tomato) }
it 'returns a hash of plant_part values' do
@@ -244,7 +269,6 @@ describe Crop do
)
crop.popular_plant_parts.should == { @fruit => 2, @seed => 1, @root => 1 }
end
-
end
context 'interesting' do
@@ -295,7 +319,6 @@ describe Crop do
Crop.interesting.should include @crop1
Crop.interesting.should_not include @crop2
Crop.interesting.size.should == 1
-
end
it 'ignores crops without photos' do
@@ -322,7 +345,6 @@ describe Crop do
Crop.interesting.should_not include @crop2
Crop.interesting.size.should == 1
end
-
end
context "harvests" do
@@ -364,7 +386,6 @@ describe Crop do
end
context "search" do
-
let(:mushroom) { FactoryGirl.create(:crop, name: 'mushroom') }
before do
@@ -396,7 +417,6 @@ describe Crop do
end
context "csv loading" do
-
before(:each) do
# don't use 'let' for this -- we need to actually create it,
# regardless of whether it's used.
@@ -404,7 +424,6 @@ describe Crop do
end
context "scientific names" do
-
it "adds a scientific name to a crop that has none" do
tomato = FactoryGirl.create(:tomato)
expect(tomato.scientific_names.size).to eq 0
@@ -469,7 +488,6 @@ describe Crop do
tomato.add_scientific_names_from_csv("Baz, Quux") # multiple spaces
expect(tomato.scientific_names.size).to eq 4
end
-
end # scientific names
context "alternate names" do
@@ -571,9 +589,7 @@ describe Crop do
expect(loaded.name).to eq "tomato"
expect(loaded.en_wikipedia_url).to eq 'http://en.wikipedia.org/wiki/Tomato'
expect(loaded.creator).to eq @cropbot
-
end
-
end
context "crop-post association" do
@@ -597,8 +613,17 @@ describe Crop do
end
context "crop rejections" do
- let!(:rejected_reason) { FactoryGirl.create(:crop, name: 'tomato', approval_status: 'rejected', reason_for_rejection: 'not edible') }
- let!(:rejected_other) { FactoryGirl.create(:crop, name: 'tomato', approval_status: 'rejected', reason_for_rejection: 'other', rejection_notes: 'blah blah blah') }
+ let!(:rejected_reason) do
+ FactoryGirl.create(:crop, name: 'tomato',
+ approval_status: 'rejected',
+ reason_for_rejection: 'not edible')
+ end
+ let!(:rejected_other) do
+ FactoryGirl.create(:crop, name: 'tomato',
+ approval_status: 'rejected',
+ reason_for_rejection: 'other',
+ rejection_notes: 'blah blah blah')
+ end
describe "rejecting a crop" do
it "should give reason if a default option" do
diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb
index 7bebbc7f3..2fd0b6b80 100644
--- a/spec/models/follow_spec.rb
+++ b/spec/models/follow_spec.rb
@@ -1,7 +1,6 @@
require 'spec_helper'
describe Follow do
-
before(:each) do
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@@ -21,7 +20,6 @@ describe Follow do
end
context "when follow is created" do
-
before (:each) do
@follow = Follow.create(follower_id: @member1.id, followed_id: @member2.id)
end
@@ -41,5 +39,4 @@ describe Follow do
expect(@member2.followers).not_to include(@member1)
end
end
-
-end
\ No newline at end of file
+end
diff --git a/spec/models/forum_spec.rb b/spec/models/forum_spec.rb
index 72fafd31c..4c1c42275 100644
--- a/spec/models/forum_spec.rb
+++ b/spec/models/forum_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Forum do
-
let(:forum) { FactoryGirl.create(:forum) }
it "belongs to an owner" do
@@ -27,5 +26,4 @@ describe Forum do
@post2 = FactoryGirl.create(:forum_post, forum: forum, created_at: 1.day.ago)
forum.posts.first.should eq @post2
end
-
end
diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb
index 1332e7287..4ffb1bfc5 100644
--- a/spec/models/garden_spec.rb
+++ b/spec/models/garden_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Garden do
-
let(:owner) { FactoryGirl.create(:member) }
let(:garden) { FactoryGirl.create(:garden, owner: owner) }
@@ -23,11 +22,26 @@ describe Garden do
garden.should_not be_valid
end
+ it "allows numbers" do
+ garden = FactoryGirl.build(:garden, name: "100 vines of 2 kamo-kamo")
+ garden.should_not be_valid
+ end
+
+ it "allows macrons" do
+ garden = FactoryGirl.build(:garden, name: "Kūmara and pūha patch")
+ garden.should_not be_valid
+ end
+
it "doesn't allow a name with only spaces" do
garden = FactoryGirl.build(:garden, name: " ")
garden.should_not be_valid
end
+ it "doesn't allow a new lines in garden names" do
+ garden = FactoryGirl.build(:garden, name: "My garden\nI am a 1337 hacker")
+ garden.should_not be_valid
+ end
+
it "should have an owner" do
garden.owner.should be_an_instance_of Member
end
@@ -37,7 +51,6 @@ describe Garden do
end
context "featured plantings" do
-
let(:tomato) { FactoryGirl.create(:tomato) }
let(:maize) { FactoryGirl.create(:maize) }
let(:chard) { FactoryGirl.create(:chard) }
@@ -50,7 +63,6 @@ describe Garden do
@p2 = FactoryGirl.create(:planting, crop: maize, garden: garden)
garden.featured_plantings.should eq [@p2, @p1]
-
end
it "should fetch most recent 4 featured plantings" do
@@ -153,7 +165,6 @@ describe Garden do
end
context 'active scopes' do
-
let(:active) { FactoryGirl.create(:garden) }
let(:inactive) { FactoryGirl.create(:inactive_garden) }
@@ -204,7 +215,6 @@ describe Garden do
end
context 'photos' do
-
let(:garden) { FactoryGirl.create(:garden) }
let(:photo) { FactoryGirl.create(:photo) }
@@ -219,18 +229,17 @@ describe Garden do
it 'deletes association with photos when photo is deleted' do
photo.destroy
garden.reload
- garden.photos.should be_empty
+ garden.photos.should be_empty
end
it 'has a default photo' do
- garden.default_photo.should eq photo
+ garden.default_photo.should eq photo
end
it 'chooses the most recent photo' do
- @photo2 = FactoryGirl.create(:photo)
+ @photo2 = FactoryGirl.create(:photo)
garden.photos << @photo2
garden.default_photo.should eq @photo2
end
end
-
end
diff --git a/spec/models/harvest_spec.rb b/spec/models/harvest_spec.rb
index 4dbeed752..a3aedddf2 100644
--- a/spec/models/harvest_spec.rb
+++ b/spec/models/harvest_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Harvest do
-
it "has an owner" do
harvest = FactoryGirl.create(:harvest)
harvest.owner.should be_an_instance_of Member
@@ -46,7 +45,8 @@ describe Harvest do
context 'units' do
it 'all valid units should work' do
- ['individual','bunch','sprig','handful','litre','pint','quart','bucket','basket','bushel', nil, ''].each do |s|
+ ['individual', 'bunch', 'sprig', 'handful', 'litre',
+ 'pint', 'quart', 'bucket', 'basket', 'bushel', nil, ''].each do |s|
@harvest = FactoryGirl.build(:harvest, unit: s)
@harvest.should be_valid
end
@@ -147,92 +147,89 @@ describe Harvest do
end
context "stringification" do
-
let(:crop) { FactoryGirl.create(:crop, name: "apricot") }
it "apricots" do
@h = FactoryGirl.create(:harvest, crop: crop,
- quantity: nil,
- unit: nil,
- weight_quantity: nil,
- weight_unit: nil
+ quantity: nil,
+ unit: nil,
+ weight_quantity: nil,
+ weight_unit: nil
)
@h.to_s.should eq "apricots"
end
it "1 individual apricot" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: 1,
- unit: 'individual',
- weight_quantity: nil,
- weight_unit: nil
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: 1,
+ unit: 'individual',
+ weight_quantity: nil,
+ weight_unit: nil
)
@h.to_s.should eq "1 individual apricot"
end
it "10 individual apricots" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: 10,
- unit: 'individual',
- weight_quantity: nil,
- weight_unit: nil
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: 10,
+ unit: 'individual',
+ weight_quantity: nil,
+ weight_unit: nil
)
@h.to_s.should eq "10 individual apricots"
end
it "1 bushel of apricots" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: 1,
- unit: 'bushel',
- weight_quantity: nil,
- weight_unit: nil
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: 1,
+ unit: 'bushel',
+ weight_quantity: nil,
+ weight_unit: nil
)
@h.to_s.should eq "1 bushel of apricots"
end
it "1.5 bushels of apricots" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: 1.5,
- unit: 'bushel',
- weight_quantity: nil,
- weight_unit: nil
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: 1.5,
+ unit: 'bushel',
+ weight_quantity: nil,
+ weight_unit: nil
)
@h.to_s.should eq "1.5 bushels of apricots"
end
it "10 bushels of apricots" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: 10,
- unit: 'bushel',
- weight_quantity: nil,
- weight_unit: nil
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: 10,
+ unit: 'bushel',
+ weight_quantity: nil,
+ weight_unit: nil
)
@h.to_s.should eq "10 bushels of apricots"
end
it "apricots weighing 1.2 kg" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: nil,
- unit: nil,
- weight_quantity: 1.2,
- weight_unit: 'kg'
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: nil,
+ unit: nil,
+ weight_quantity: 1.2,
+ weight_unit: 'kg'
)
@h.to_s.should eq "apricots weighing 1.2 kg"
end
it "10 bushels of apricots weighing 100 kg" do
- @h = FactoryGirl.create(:harvest, crop: crop,
- quantity: 10,
- unit: 'bushel',
- weight_quantity: 100,
- weight_unit: 'kg')
+ @h = FactoryGirl.create(:harvest, crop: crop,
+ quantity: 10,
+ unit: 'bushel',
+ weight_quantity: 100,
+ weight_unit: 'kg')
@h.to_s.should eq "10 bushels of apricots weighing 100 kg"
end
-
end
context 'photos' do
-
before :each do
@harvest = FactoryGirl.create(:harvest)
end
@@ -288,7 +285,6 @@ describe Harvest do
end
end
-
context 'and a second photo' do
before :each do
@photo2 = FactoryGirl.create(:photo)
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index dfb413df0..cc6281fc4 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -1,9 +1,7 @@
require 'rails_helper'
describe 'member' do
-
context 'valid member' do
-
let(:member) { FactoryGirl.create(:member) }
it 'should be fetchable from the database' do
@@ -91,11 +89,9 @@ describe 'member' do
member.latitude.should be_nil
member.longitude.should be_nil
end
-
end
context 'no TOS agreement' do
-
let(:member) { FactoryGirl.build(:no_tos_member) }
it "should refuse to save a member who hasn't agreed to the TOS" do
@@ -188,7 +184,6 @@ describe 'member' do
end
context 'roles' do
-
let(:member) { FactoryGirl.create(:member) }
let(:role) { FactoryGirl.create(:role) }
@@ -280,10 +275,8 @@ describe 'member' do
@member2.updated_at = 2.days.ago
@member3.updated_at = 1.days.ago
- Member.interesting.should eq [ @member3, @member2, @member1 ]
-
+ Member.interesting.should eq [@member3, @member2, @member1]
end
-
end
context 'orders' do
@@ -303,19 +296,18 @@ describe 'member' do
end
context "paid accounts" do
-
let(:member) { FactoryGirl.create(:member) }
it "recognises a permanent paid account" do
@account_type = FactoryGirl.create(:account_type,
- is_paid: true, is_permanent_paid: true)
+ is_paid: true, is_permanent_paid: true)
member.account.account_type = @account_type
member.is_paid?.should be(true)
end
it "recognises a current paid account" do
@account_type = FactoryGirl.create(:account_type,
- is_paid: true, is_permanent_paid: false)
+ is_paid: true, is_permanent_paid: false)
member.account.account_type = @account_type
member.account.paid_until = Time.zone.now + 1.month
member.is_paid?.should be(true)
@@ -323,7 +315,7 @@ describe 'member' do
it "recognises an expired paid account" do
@account_type = FactoryGirl.create(:account_type,
- is_paid: true, is_permanent_paid: false)
+ is_paid: true, is_permanent_paid: false)
member.account.account_type = @account_type
member.account.paid_until = Time.zone.now - 1.minute
member.is_paid?.should be(false)
@@ -331,23 +323,21 @@ describe 'member' do
it "recognises a free account" do
@account_type = FactoryGirl.create(:account_type,
- is_paid: false, is_permanent_paid: false)
+ is_paid: false, is_permanent_paid: false)
member.account.account_type = @account_type
member.is_paid?.should be(false)
end
it "recognises a free account even with paid_until set" do
@account_type = FactoryGirl.create(:account_type,
- is_paid: false, is_permanent_paid: false)
+ is_paid: false, is_permanent_paid: false)
member.account.account_type = @account_type
member.account.paid_until = Time.zone.now + 1.month
member.is_paid?.should be(false)
end
-
end
context "update account" do
-
let(:product) { FactoryGirl.create(:product,
paid_months: 3
)}
@@ -380,11 +370,9 @@ describe 'member' do
end
context 'member who followed another member' do
-
-
let(:member1) { FactoryGirl.create(:member) }
let(:member2) { FactoryGirl.create(:member) }
- let(:member3) { FactoryGirl.create(:member) }
+ let(:member3) { FactoryGirl.create(:member) }
before do
@follow = member1.follows.create(follower_id: member1.id, followed_id: member2.id)
@@ -409,7 +397,5 @@ describe 'member' do
expect(member1.get_follow(member3)).to be_nil
end
end
-
end
-
end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index e38444d5d..04cb028f3 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Notification do
-
let(:notification) { FactoryGirl.create(:notification) }
it "belongs to a post" do
@@ -56,5 +55,4 @@ describe Notification do
notification = FactoryGirl.create(:notification, subject: " ")
notification.subject.should == "(no subject)"
end
-
end
diff --git a/spec/models/order_item_spec.rb b/spec/models/order_item_spec.rb
index 67f86415c..a6ede25d8 100644
--- a/spec/models/order_item_spec.rb
+++ b/spec/models/order_item_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe OrderItem do
-
let(:order_item) { FactoryGirl.create(:order_item) }
it "has an order and a product" do
@@ -24,5 +23,4 @@ describe OrderItem do
@order_item2 = FactoryGirl.build(:order_item, order: @order)
@order_item2.should_not be_valid
end
-
end
diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb
index 6a74baf11..30e6cf261 100644
--- a/spec/models/order_spec.rb
+++ b/spec/models/order_spec.rb
@@ -60,7 +60,7 @@ describe Order do
@order_item1 = FactoryGirl.create(:order_item,
order_id: @order.id, product_id: @product.id, price: 1111, quantity: 1)
- @order.total.should eq 1111
+ @order.total.should eq 1111
end
it "gives the correct total for quantities more than 1" do
@@ -74,7 +74,7 @@ describe Order do
@order_item1 = FactoryGirl.create(:order_item,
order_id: @order.id, product_id: @product.id, price: 1111, quantity: 2)
- @order.total.should eq 2222
+ @order.total.should eq 2222
end
it "formats order items for activemerchant" do
@@ -94,7 +94,6 @@ describe Order do
quantity: 1,
amount: 1111
}]
-
end
context "referral codes" do
@@ -139,7 +138,5 @@ describe Order do
order = FactoryGirl.create(:order, referral_code: 'baz')
Order.search(by: 'referral_code', for: 'baz').should eq [order]
end
-
end
-
end
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index bd6335be2..5ec32bf73 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Photo do
-
describe 'add/delete functionality' do
let(:photo) { FactoryGirl.create(:photo) }
let(:planting) { FactoryGirl.create(:planting) }
@@ -105,9 +104,7 @@ describe Photo do
planting.destroy # photo is still used by the harvest
expect(photo).to be_an_instance_of Photo
end
-
end # removing photos
-
end # add/delete functionality
describe 'flickr_metadata' do
diff --git a/spec/models/plant_part_spec.rb b/spec/models/plant_part_spec.rb
index ef3705ef2..bd2ee6407 100644
--- a/spec/models/plant_part_spec.rb
+++ b/spec/models/plant_part_spec.rb
@@ -35,5 +35,4 @@ describe PlantPart do
)
@pp1.crops.should eq [@maize]
end
-
end
diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb
index 3663f8c29..327379fc3 100644
--- a/spec/models/planting_spec.rb
+++ b/spec/models/planting_spec.rb
@@ -1,12 +1,11 @@
require 'rails_helper'
describe Planting do
-
let(:crop) { FactoryGirl.create(:tomato) }
let(:garden_owner) { FactoryGirl.create(:member) }
let(:garden) { FactoryGirl.create(:garden, owner: garden_owner) }
let(:planting) { FactoryGirl.create(:planting,
- crop: crop, garden: garden)}
+ crop: crop, garden: garden)}
it 'has an owner' do
planting.owner.should be_an_instance_of Member
@@ -76,7 +75,7 @@ describe Planting do
it 'should not be calculated for plantings with an unknown days before maturity' do
@planting = FactoryGirl.build(:planting, days_before_maturity: nil)
- @planting.percentage_grown.should be nil
+ @planting.percentage_grown.should be nil
end
end
@@ -123,7 +122,6 @@ describe Planting do
end
context 'sunniness' do
-
let(:planting) { FactoryGirl.create(:sunny_planting) }
it 'should have a sunniness value' do
@@ -152,8 +150,8 @@ describe Planting do
it 'all valid planted_from values should work' do
['seed', 'seedling', 'cutting', 'root division',
- 'runner', 'bare root plant', 'advanced plant',
- 'graft', 'layering', 'bulb', 'root/tuber', nil, ''].each do |p|
+ 'runner', 'bare root plant', 'advanced plant',
+ 'graft', 'layering', 'bulb', 'root/tuber', nil, ''].each do |p|
@planting = FactoryGirl.build(:planting, planted_from: p)
@planting.should be_valid
end
@@ -169,7 +167,6 @@ describe Planting do
# we decided that all the tests for the planting/photo association would
# be done on this side, not on the photos side
context 'photos' do
-
let(:planting) { FactoryGirl.create(:planting) }
let(:photo) { FactoryGirl.create(:photo) }
@@ -278,7 +275,6 @@ describe Planting do
Planting.interesting(3, false).size.should eq 3
end
end
-
end # interesting plantings
context "finished" do
@@ -304,7 +300,7 @@ describe Planting do
context "finished date validation" do
it 'requires finished date after planting date' do
- @f = FactoryGirl.build(:finished_planting, planted_at: '2014-01-01', finished_at: '2013-01-01')
+ @f = FactoryGirl.build(:finished_planting, planted_at: '2014-01-01', finished_at: '2013-01-01')
@f.should_not be_valid
end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 8fa53fffe..375b56586 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Post do
-
let(:member) { FactoryGirl.create(:member) }
it "should be sorted in reverse order" do
@@ -66,11 +65,10 @@ describe Post do
end
context "recent activity" do
-
before do
Time.stub(now: Time.now)
end
-
+
let(:post) { FactoryGirl.create(:post, created_at: 1.day.ago) }
it "sets recent activity to post time" do
@@ -79,7 +77,7 @@ describe Post do
it "sets recent activity to comment time" do
@comment = FactoryGirl.create(:comment, post: post,
- created_at: 1.hour.ago)
+ created_at: 1.hour.ago)
post.recent_activity.to_i.should eq @comment.created_at.to_i
end
diff --git a/spec/models/product_spec.rb b/spec/models/product_spec.rb
index af1a02ba5..6526ecf27 100644
--- a/spec/models/product_spec.rb
+++ b/spec/models/product_spec.rb
@@ -1,10 +1,8 @@
require 'rails_helper'
describe Product do
-
it "stringifies using the name" do
@product = FactoryGirl.create(:product)
@product.to_s.should eq @product.name
end
-
end
diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb
index 6ea5d1a9d..f8393ae84 100644
--- a/spec/models/role_spec.rb
+++ b/spec/models/role_spec.rb
@@ -1,7 +1,7 @@
require 'rails_helper'
describe Role do
- let(:member) { FactoryGirl.create(:member) }
+ let(:member) { FactoryGirl.create(:member) }
subject do
role = FactoryGirl.create(:role, name: 'Crop Wrangler')
diff --git a/spec/models/scientific_name_spec.rb b/spec/models/scientific_name_spec.rb
index e506acccf..b4b498db0 100644
--- a/spec/models/scientific_name_spec.rb
+++ b/spec/models/scientific_name_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
describe ScientificName do
context 'all fields present' do
-
let(:sn) { FactoryGirl.create(:zea_mays) }
it 'should save a basic scientific name' do
diff --git a/spec/models/seed_spec.rb b/spec/models/seed_spec.rb
index 58ae5f906..5e6a9ff19 100644
--- a/spec/models/seed_spec.rb
+++ b/spec/models/seed_spec.rb
@@ -1,7 +1,6 @@
require 'rails_helper'
describe Seed do
-
let(:seed) { FactoryGirl.build(:seed) }
it 'should save a basic seed' do
@@ -48,7 +47,10 @@ describe Seed do
it 'should refuse invalid tradable_to values' do
@seed = FactoryGirl.build(:seed, tradable_to: 'not valid')
@seed.should_not be_valid
- @seed.errors[:tradable_to].should include("You may only trade seed nowhere, locally, nationally, or internationally")
+ @seed.errors[:tradable_to].should include(
+ "You may only trade seed nowhere, locally, "\
+ "nationally, or internationally"
+ )
end
it 'should not allow nil or blank values' do
@@ -82,14 +84,13 @@ describe Seed do
@untradable = FactoryGirl.create(:untradable_seed)
Seed.tradable.should include @tradable
Seed.tradable.should_not include @untradable
-
end
end
context 'organic, gmo, heirloom' do
it 'all valid organic values should work' do
- ['certified organic', 'non-certified organic',
- 'conventional/non-organic', 'unknown'].each do |t|
+ ['certified organic', 'non-certified organic',
+ 'conventional/non-organic', 'unknown'].each do |t|
@seed = FactoryGirl.build(:seed, organic: t)
@seed.should be_valid
end
@@ -104,7 +105,7 @@ describe Seed do
end
it 'all valid heirloom values should work' do
- %w(heirloom hybrid unknown).each do |t|
+ %w(heirloom hybrid unknown).each do |t|
@seed = FactoryGirl.build(:seed, heirloom: t)
@seed.should be_valid
end
@@ -128,10 +129,8 @@ describe Seed do
end
end
-
context 'interesting' do
it 'lists interesting seeds' do
-
# to be interesting a seed must:
# 1) be tradable
# 2) the owner must have a location set
@@ -149,5 +148,4 @@ describe Seed do
Seed.interesting.size.should == 1
end
end
-
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c9ab1e79e..cdfb951cb 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -5,9 +5,9 @@ require 'coveralls'
# output coverage locally AND send it to coveralls
SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
- SimpleCov::Formatter::HTMLFormatter,
- Coveralls::SimpleCov::Formatter
-])
+ SimpleCov::Formatter::HTMLFormatter,
+ Coveralls::SimpleCov::Formatter
+ ])
# fail if there's a significant test coverage drop
SimpleCov.maximum_coverage_drop 1
@@ -37,7 +37,7 @@ if ENV['GROWSTUFF_CAPYBARA_DRIVER'].present?
end
Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
- "screenshot_#{example.description.gsub(' ', '-').gsub(/^.*\/spec\//,'')}"
+ "screenshot_#{example.description.gsub(' ', '-').gsub(/^.*\/spec\//, '')}"
end
Capybara.app_host = 'http://localhost'
@@ -59,7 +59,7 @@ include Warden::Test::Helpers
# require only the support files necessary.
#
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-Dir[Rails.root.join("spec/features/shared_examples/**/*.rb")].each {|f| require f}
+Dir[Rails.root.join("spec/features/shared_examples/**/*.rb")].each { |f| require f }
# Checks for pending migrations before tests are run.
# If you are not using ActiveRecord, you can remove this line.
diff --git a/spec/routing/account_types_routing_spec.rb b/spec/routing/account_types_routing_spec.rb
index 83dba34a5..8402dd727 100644
--- a/spec/routing/account_types_routing_spec.rb
+++ b/spec/routing/account_types_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe AccountTypesController do
describe "routing" do
-
it "routes to #index" do
get("/account_types").should route_to("account_types#index")
end
@@ -30,6 +29,5 @@ describe AccountTypesController do
it "routes to #destroy" do
delete("/account_types/1").should route_to("account_types#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/authentications_routing_spec.rb b/spec/routing/authentications_routing_spec.rb
index 75f86fd49..0601b9924 100644
--- a/spec/routing/authentications_routing_spec.rb
+++ b/spec/routing/authentications_routing_spec.rb
@@ -9,6 +9,5 @@ describe AuthenticationsController do
it "routes to #destroy" do
delete("/authentications/1").should route_to("authentications#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/comments_routing_spec.rb b/spec/routing/comments_routing_spec.rb
index b5466af43..5390ab066 100644
--- a/spec/routing/comments_routing_spec.rb
+++ b/spec/routing/comments_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe CommentsController do
describe "routing" do
-
it "routes to #index" do
get("/comments").should route_to("comments#index")
end
@@ -30,6 +29,5 @@ describe CommentsController do
it "routes to #destroy" do
delete("/comments/1").should route_to("comments#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/crops_routing_spec.rb b/spec/routing/crops_routing_spec.rb
index 95985917f..97c1a874c 100644
--- a/spec/routing/crops_routing_spec.rb
+++ b/spec/routing/crops_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe CropsController do
describe "routing" do
-
it "routes to #index" do
get("/crops").should route_to("crops#index")
end
@@ -30,6 +29,5 @@ describe CropsController do
it "routes to #destroy" do
delete("/crops/1").should route_to("crops#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/follows_routing_spec.rb b/spec/routing/follows_routing_spec.rb
index 4158502c7..ddb01e00c 100644
--- a/spec/routing/follows_routing_spec.rb
+++ b/spec/routing/follows_routing_spec.rb
@@ -2,7 +2,6 @@ require "spec_helper"
describe FollowsController do
describe "routing" do
-
it "routes to #create" do
post("/follows").should route_to("follows#create")
end
@@ -10,6 +9,5 @@ describe FollowsController do
it "routes to #destroy" do
delete("/follows/1").should route_to("follows#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/forums_routing_spec.rb b/spec/routing/forums_routing_spec.rb
index 12730c556..9ce6f427b 100644
--- a/spec/routing/forums_routing_spec.rb
+++ b/spec/routing/forums_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe ForumsController do
describe "routing" do
-
it "routes to #index" do
get("/forums").should route_to("forums#index")
end
@@ -30,6 +29,5 @@ describe ForumsController do
it "routes to #destroy" do
delete("/forums/1").should route_to("forums#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/gardens_routing_spec.rb b/spec/routing/gardens_routing_spec.rb
index 5270195ec..6888f099f 100644
--- a/spec/routing/gardens_routing_spec.rb
+++ b/spec/routing/gardens_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe GardensController do
describe "routing" do
-
it "routes to #index" do
get("/gardens").should route_to("gardens#index")
end
@@ -30,6 +29,5 @@ describe GardensController do
it "routes to #destroy" do
delete("/gardens/1").should route_to("gardens#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/harvests_routing_spec.rb b/spec/routing/harvests_routing_spec.rb
index 4d532bcfc..c6890df15 100644
--- a/spec/routing/harvests_routing_spec.rb
+++ b/spec/routing/harvests_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe HarvestsController do
describe "routing" do
-
it "routes to #index" do
get("/harvests").should route_to("harvests#index")
end
@@ -30,6 +29,5 @@ describe HarvestsController do
it "routes to #destroy" do
delete("/harvests/1").should route_to("harvests#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/notifications_routing_spec.rb b/spec/routing/notifications_routing_spec.rb
index d3c2b9f61..bb7335e1b 100644
--- a/spec/routing/notifications_routing_spec.rb
+++ b/spec/routing/notifications_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe NotificationsController do
describe "routing" do
-
it "routes to #index" do
get("/notifications").should route_to("notifications#index")
end
@@ -30,6 +29,5 @@ describe NotificationsController do
it "routes to #destroy" do
delete("/notifications/1").should route_to("notifications#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/order_items_routing_spec.rb b/spec/routing/order_items_routing_spec.rb
index 6562e3a17..7487cb9f5 100644
--- a/spec/routing/order_items_routing_spec.rb
+++ b/spec/routing/order_items_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe OrderItemsController do
describe "routing" do
-
it "routes to #index" do
get("/order_items").should route_to("order_items#index")
end
@@ -30,6 +29,5 @@ describe OrderItemsController do
it "routes to #destroy" do
delete("/order_items/1").should route_to("order_items#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/orders_routing_spec.rb b/spec/routing/orders_routing_spec.rb
index 61410745e..38184ef33 100644
--- a/spec/routing/orders_routing_spec.rb
+++ b/spec/routing/orders_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe OrdersController do
describe "routing" do
-
it "routes to #index" do
get("/orders").should route_to("orders#index")
end
@@ -30,6 +29,5 @@ describe OrdersController do
it "routes to #destroy" do
delete("/orders/1").should route_to("orders#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/photos_routing_spec.rb b/spec/routing/photos_routing_spec.rb
index fb96758c2..a645d0a60 100644
--- a/spec/routing/photos_routing_spec.rb
+++ b/spec/routing/photos_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe PhotosController do
describe "routing" do
-
it "routes to #index" do
get("/photos").should route_to("photos#index")
end
@@ -30,6 +29,5 @@ describe PhotosController do
it "routes to #destroy" do
delete("/photos/1").should route_to("photos#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/plant_parts_routing_spec.rb b/spec/routing/plant_parts_routing_spec.rb
index 4a4137cd6..966047f3f 100644
--- a/spec/routing/plant_parts_routing_spec.rb
+++ b/spec/routing/plant_parts_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe PlantPartsController do
describe "routing" do
-
it "routes to #index" do
get("/plant_parts").should route_to("plant_parts#index")
end
@@ -30,6 +29,5 @@ describe PlantPartsController do
it "routes to #destroy" do
delete("/plant_parts/1").should route_to("plant_parts#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/plantings_routing_spec.rb b/spec/routing/plantings_routing_spec.rb
index 1be8416d4..473fe827e 100644
--- a/spec/routing/plantings_routing_spec.rb
+++ b/spec/routing/plantings_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe PlantingsController do
describe "routing" do
-
it "routes to #index" do
get("/plantings").should route_to("plantings#index")
end
@@ -30,6 +29,5 @@ describe PlantingsController do
it "routes to #destroy" do
delete("/plantings/1").should route_to("plantings#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/products_routing_spec.rb b/spec/routing/products_routing_spec.rb
index 189bbe59a..15166a805 100644
--- a/spec/routing/products_routing_spec.rb
+++ b/spec/routing/products_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe ProductsController do
describe "routing" do
-
it "routes to #index" do
get("/products").should route_to("products#index")
end
@@ -30,6 +29,5 @@ describe ProductsController do
it "routes to #destroy" do
delete("/products/1").should route_to("products#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/roles_routing_spec.rb b/spec/routing/roles_routing_spec.rb
index 752bd7c49..7b6469efb 100644
--- a/spec/routing/roles_routing_spec.rb
+++ b/spec/routing/roles_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe RolesController do
describe "routing" do
-
it "routes to #index" do
get("/roles").should route_to("roles#index")
end
@@ -30,6 +29,5 @@ describe RolesController do
it "routes to #destroy" do
delete("/roles/1").should route_to("roles#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/scientific_names_routing_spec.rb b/spec/routing/scientific_names_routing_spec.rb
index f5bfa780e..7bbbfa764 100644
--- a/spec/routing/scientific_names_routing_spec.rb
+++ b/spec/routing/scientific_names_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe ScientificNamesController do
describe "routing" do
-
it "routes to #index" do
get("/scientific_names").should route_to("scientific_names#index")
end
@@ -30,6 +29,5 @@ describe ScientificNamesController do
it "routes to #destroy" do
delete("/scientific_names/1").should route_to("scientific_names#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/seeds_routing_spec.rb b/spec/routing/seeds_routing_spec.rb
index 5ac7ae02c..74f4aff64 100644
--- a/spec/routing/seeds_routing_spec.rb
+++ b/spec/routing/seeds_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe SeedsController do
describe "routing" do
-
it "routes to #index" do
get("/seeds").should route_to("seeds#index")
end
@@ -30,6 +29,5 @@ describe SeedsController do
it "routes to #destroy" do
delete("/seeds/1").should route_to("seeds#destroy", id: "1")
end
-
end
end
diff --git a/spec/routing/updates_routing_spec.rb b/spec/routing/updates_routing_spec.rb
index 32be13b86..966647515 100644
--- a/spec/routing/updates_routing_spec.rb
+++ b/spec/routing/updates_routing_spec.rb
@@ -2,7 +2,6 @@ require "rails_helper"
describe PostsController do
describe "routing" do
-
it "routes to #index" do
get("/posts").should route_to("posts#index")
end
@@ -30,6 +29,5 @@ describe PostsController do
it "routes to #destroy" do
delete("/posts/1").should route_to("posts#destroy", id: "1")
end
-
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8c7b0b9fe..7b314e901 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -42,8 +42,8 @@ RSpec.configure do |config|
mocks.syntax = [:should, :expect]
end
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
+ # The settings below are suggested to provide a good initial experience
+ # with RSpec, but feel free to customize to your heart's content.
# These two settings work together to allow you to limit a spec run
# to individual examples or groups you care about by tagging them with
@@ -85,5 +85,4 @@ RSpec.configure do |config|
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
-
end
diff --git a/spec/support/controller_macros.rb b/spec/support/controller_macros.rb
index 2e8162705..393d7221b 100644
--- a/spec/support/controller_macros.rb
+++ b/spec/support/controller_macros.rb
@@ -1,9 +1,7 @@
# Taken unashamedly from https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29
module ControllerMacros
- def login_member(member_factory=:member)
-
- let(:member) { member = FactoryGirl.create(member_factory || :member) }
-
+ def login_member(member_factory = :member)
+ let(:member) { member = FactoryGirl.create(member_factory || :member) }
before(:each) do
@request.env["devise.mapping"] = Devise.mappings[:member]
sign_in member
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index 051579ea7..e0dbc9aa8 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -1,5 +1,4 @@
RSpec.configure do |config|
-
config.before(:suite) do
DatabaseCleaner.clean_with(:truncation)
end
@@ -19,5 +18,4 @@ RSpec.configure do |config|
config.after(:each) do
DatabaseCleaner.clean
end
-
-end
\ No newline at end of file
+end
diff --git a/spec/support/elasticsearch_helpers.rb b/spec/support/elasticsearch_helpers.rb
index 94cf447ff..1d1db1db3 100644
--- a/spec/support/elasticsearch_helpers.rb
+++ b/spec/support/elasticsearch_helpers.rb
@@ -1,7 +1,7 @@
module ElasticsearchHelpers
def sync_elasticsearch(crops)
if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
- crops.each {|crop| crop.__elasticsearch__.index_document}
+ crops.each { |crop| crop.__elasticsearch__.index_document }
Crop.__elasticsearch__.refresh_index!
end
end
diff --git a/spec/support/feature_helpers.rb b/spec/support/feature_helpers.rb
index b4da3b755..dbe4f327b 100644
--- a/spec/support/feature_helpers.rb
+++ b/spec/support/feature_helpers.rb
@@ -1,6 +1,5 @@
module FeatureHelpers
-
- def fill_autocomplete(field, options={})
+ def fill_autocomplete(field, options = {})
fill_in field, with: options[:with]
page.execute_script %Q{ $('##{field}').trigger('focus'); }
@@ -12,9 +11,8 @@ module FeatureHelpers
selector = %Q{ul.ui-autocomplete li.ui-menu-item a:contains("#{select}")}
page.execute_script %Q{ $('#{selector}').mouseenter().click() }
end
-
end
RSpec.configure do |config|
config.include FeatureHelpers, type: :feature
-end
\ No newline at end of file
+end
diff --git a/spec/views/account_types/edit.html.haml_spec.rb b/spec/views/account_types/edit.html.haml_spec.rb
index f8fa80cc3..c53272c0e 100644
--- a/spec/views/account_types/edit.html.haml_spec.rb
+++ b/spec/views/account_types/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "account_types/edit" do
diff --git a/spec/views/account_types/index.html.haml_spec.rb b/spec/views/account_types/index.html.haml_spec.rb
index 76a83d269..ca86626f3 100644
--- a/spec/views/account_types/index.html.haml_spec.rb
+++ b/spec/views/account_types/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "account_types/index" do
diff --git a/spec/views/account_types/new.html.haml_spec.rb b/spec/views/account_types/new.html.haml_spec.rb
index 8ec9fc1ff..01e1f025a 100644
--- a/spec/views/account_types/new.html.haml_spec.rb
+++ b/spec/views/account_types/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "account_types/new" do
diff --git a/spec/views/account_types/show.html.haml_spec.rb b/spec/views/account_types/show.html.haml_spec.rb
index bfbd50243..adad83ad8 100644
--- a/spec/views/account_types/show.html.haml_spec.rb
+++ b/spec/views/account_types/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "account_types/show" do
diff --git a/spec/views/accounts/edit.html.haml_spec.rb b/spec/views/accounts/edit.html.haml_spec.rb
index 2f265658f..4b278acc2 100644
--- a/spec/views/accounts/edit.html.haml_spec.rb
+++ b/spec/views/accounts/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "accounts/edit" do
diff --git a/spec/views/accounts/index.html.haml_spec.rb b/spec/views/accounts/index.html.haml_spec.rb
index 60b2cf6f6..192c86dab 100644
--- a/spec/views/accounts/index.html.haml_spec.rb
+++ b/spec/views/accounts/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "accounts/index" do
diff --git a/spec/views/accounts/new.html.haml_spec.rb b/spec/views/accounts/new.html.haml_spec.rb
index f51649226..bc2b711fa 100644
--- a/spec/views/accounts/new.html.haml_spec.rb
+++ b/spec/views/accounts/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "accounts/new" do
diff --git a/spec/views/accounts/show.html.haml_spec.rb b/spec/views/accounts/show.html.haml_spec.rb
index 7b4e273d1..351a8fb24 100644
--- a/spec/views/accounts/show.html.haml_spec.rb
+++ b/spec/views/accounts/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "accounts/show" do
diff --git a/spec/views/admin/index_spec.rb b/spec/views/admin/index_spec.rb
index 79ac5d965..32e77b9ee 100644
--- a/spec/views/admin/index_spec.rb
+++ b/spec/views/admin/index_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'admin/index.html.haml', type: "view" do
diff --git a/spec/views/admin/newsletter_spec.rb b/spec/views/admin/newsletter_spec.rb
index 55f02d0fa..fb49b2e61 100644
--- a/spec/views/admin/newsletter_spec.rb
+++ b/spec/views/admin/newsletter_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'admin/newsletter.html.haml', type: "view" do
diff --git a/spec/views/admin/orders/index_spec.rb b/spec/views/admin/orders/index_spec.rb
index 55d55773d..ea1331c94 100644
--- a/spec/views/admin/orders/index_spec.rb
+++ b/spec/views/admin/orders/index_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'admin/orders/index.html.haml', type: "view" do
diff --git a/spec/views/comments/edit.html.haml_spec.rb b/spec/views/comments/edit.html.haml_spec.rb
index d6e7ccb2a..5446d2877 100644
--- a/spec/views/comments/edit.html.haml_spec.rb
+++ b/spec/views/comments/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "comments/edit" do
diff --git a/spec/views/comments/index.html.haml_spec.rb b/spec/views/comments/index.html.haml_spec.rb
index 4b8cbf72f..86c30c508 100644
--- a/spec/views/comments/index.html.haml_spec.rb
+++ b/spec/views/comments/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "comments/index" do
@@ -24,9 +20,9 @@ describe "comments/index" do
total_entries = 2
comments = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
pager.replace([
- FactoryGirl.create(:comment),
- FactoryGirl.create(:comment, body: 'ROFL')
- ])
+ FactoryGirl.create(:comment),
+ FactoryGirl.create(:comment, body: 'ROFL')
+ ])
end
assign(:comments, comments)
render
diff --git a/spec/views/comments/index.rss.haml_spec.rb b/spec/views/comments/index.rss.haml_spec.rb
index 9c61e9f2d..68888611e 100644
--- a/spec/views/comments/index.rss.haml_spec.rb
+++ b/spec/views/comments/index.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'comments/index.rss.haml' do
@@ -22,9 +18,9 @@ describe 'comments/index.rss.haml' do
@author = FactoryGirl.create(:member)
@post = FactoryGirl.create(:post)
assign(:comments, [
- FactoryGirl.create(:comment, author: @author, post: @post),
- FactoryGirl.create(:comment, author: @author, post: @post)
- ])
+ FactoryGirl.create(:comment, author: @author, post: @post),
+ FactoryGirl.create(:comment, author: @author, post: @post)
+ ])
render
end
@@ -44,5 +40,4 @@ describe 'comments/index.rss.haml' do
it 'shows content of comments' do
rendered.should have_content "OMG LOL"
end
-
end
diff --git a/spec/views/comments/new.html.haml_spec.rb b/spec/views/comments/new.html.haml_spec.rb
index d86d304cf..2e55c843d 100644
--- a/spec/views/comments/new.html.haml_spec.rb
+++ b/spec/views/comments/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "comments/new" do
@@ -47,5 +43,4 @@ describe "comments/new" do
it 'shows markdown help' do
rendered.should have_content 'Markdown'
end
-
end
diff --git a/spec/views/comments/show.html.haml_spec.rb b/spec/views/comments/show.html.haml_spec.rb
index 80b59d33d..4cc8a8a71 100644
--- a/spec/views/comments/show.html.haml_spec.rb
+++ b/spec/views/comments/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "comments/show" do
diff --git a/spec/views/crops/_grown_for.html.haml_spec.rb b/spec/views/crops/_grown_for.html.haml_spec.rb
index 10a36aff9..776d3bdf3 100644
--- a/spec/views/crops/_grown_for.html.haml_spec.rb
+++ b/spec/views/crops/_grown_for.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/_grown_for" do
diff --git a/spec/views/crops/_planting_advice.html.haml_spec.rb b/spec/views/crops/_planting_advice.html.haml_spec.rb
index 77e7e1b38..62d85bcfa 100644
--- a/spec/views/crops/_planting_advice.html.haml_spec.rb
+++ b/spec/views/crops/_planting_advice.html.haml_spec.rb
@@ -1,24 +1,20 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/_planting_advice" do
before(:each) do
- @owner = FactoryGirl.create(:member)
+ @owner = FactoryGirl.create(:member)
@crop = FactoryGirl.create(:crop)
@garden = FactoryGirl.create(:garden, owner: @owner)
@planting = FactoryGirl.create(:planting,
@@ -48,11 +44,9 @@ describe "crops/_planting_advice" do
rendered.should have_content "Plant in:"
rendered.should have_content "sun (2), shade (1)"
end
-
end
context "planted from" do
-
it "doesn't show planted_from if none are set" do
render partial: 'crops/planting_advice', locals: { crop: @crop }
rendered.should have_content "Plant from: not known."
@@ -74,5 +68,4 @@ describe "crops/_planting_advice" do
rendered.should have_content "seed (2), cutting (1)"
end
end
-
end
diff --git a/spec/views/crops/_popover.html.haml_spec.rb b/spec/views/crops/_popover.html.haml_spec.rb
index 3ef9660f6..af97d7645 100644
--- a/spec/views/crops/_popover.html.haml_spec.rb
+++ b/spec/views/crops/_popover.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/_popover" do
@@ -32,5 +28,4 @@ describe "crops/_popover" do
it 'shows count of plantings' do
rendered.should have_content '1 time'
end
-
end
diff --git a/spec/views/crops/edit.html.haml_spec.rb b/spec/views/crops/edit.html.haml_spec.rb
index 98957fc85..436114f78 100644
--- a/spec/views/crops/edit.html.haml_spec.rb
+++ b/spec/views/crops/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/edit" do
@@ -32,5 +28,4 @@ describe "crops/edit" do
it "shows the creator" do
rendered.should have_content "Added by #{@crop.creator} less than a minute ago."
end
-
end
diff --git a/spec/views/crops/hierarchy.html.haml_spec.rb b/spec/views/crops/hierarchy.html.haml_spec.rb
index 32bfc4248..077add247 100644
--- a/spec/views/crops/hierarchy.html.haml_spec.rb
+++ b/spec/views/crops/hierarchy.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/hierarchy" do
diff --git a/spec/views/crops/index.html.haml_spec.rb b/spec/views/crops/index.html.haml_spec.rb
index 0a779241d..a11cbcb76 100644
--- a/spec/views/crops/index.html.haml_spec.rb
+++ b/spec/views/crops/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/index" do
@@ -26,7 +22,7 @@ describe "crops/index" do
@maize = FactoryGirl.create(:maize)
assign(:crops, [@tomato, @maize])
paginated_crops = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
- pager.replace([ @tomato, @maize ])
+ pager.replace([@tomato, @maize])
end
assign(:paginated_crops, paginated_crops)
end
@@ -40,8 +36,8 @@ describe "crops/index" do
end
it "linkifies crop images" do
- render
- assert_select "img", src: :tomato
+ render
+ assert_select "img", src: :tomato
end
context "logged in and crop wrangler" do
diff --git a/spec/views/crops/index.rss.haml_spec.rb b/spec/views/crops/index.rss.haml_spec.rb
index b07eab95a..5726c162c 100644
--- a/spec/views/crops/index.rss.haml_spec.rb
+++ b/spec/views/crops/index.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'crops/index.rss.haml' do
@@ -34,5 +30,4 @@ describe 'crops/index.rss.haml' do
rendered.should have_content @tomato.name
rendered.should have_content @maize.name
end
-
end
diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb
index 8b5484235..406b5e5c2 100644
--- a/spec/views/crops/new.html.haml_spec.rb
+++ b/spec/views/crops/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/new" do
@@ -32,5 +28,4 @@ describe "crops/new" do
it "shows a link to crop wrangling guidelines" do
assert_select "a[href^='http://wiki.growstuff.org']", "crop wrangling guide"
end
-
end
diff --git a/spec/views/crops/wrangle.html.haml_spec.rb b/spec/views/crops/wrangle.html.haml_spec.rb
index e4f41b8c8..b0ff06281 100644
--- a/spec/views/crops/wrangle.html.haml_spec.rb
+++ b/spec/views/crops/wrangle.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "crops/wrangle" do
@@ -26,7 +22,7 @@ describe "crops/wrangle" do
@tomato = FactoryGirl.create(:tomato)
@maize = FactoryGirl.create(:maize)
crops = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
- pager.replace([ @tomato, @maize ])
+ pager.replace([@tomato, @maize])
end
assign(:crops, crops)
assign(:crop_wranglers, Role.crop_wranglers)
@@ -48,5 +44,4 @@ describe "crops/wrangle" do
assert_select "a", text: @maize.name
assert_select "a", text: @tomato.name
end
-
end
diff --git a/spec/views/devise/confirmations/new_spec.rb b/spec/views/devise/confirmations/new_spec.rb
index 8d567d793..720822083 100644
--- a/spec/views/devise/confirmations/new_spec.rb
+++ b/spec/views/devise/confirmations/new_spec.rb
@@ -1,5 +1,4 @@
describe 'devise/confirmations/new.html.haml', type: "view" do
-
before(:each) do
@view.stub(:resource).and_return(Member.new)
@view.stub(:resource_name).and_return("member")
diff --git a/spec/views/devise/mailer/confirmation_instructions_spec.rb b/spec/views/devise/mailer/confirmation_instructions_spec.rb
index 6f60268e4..f10eb6176 100644
--- a/spec/views/devise/mailer/confirmation_instructions_spec.rb
+++ b/spec/views/devise/mailer/confirmation_instructions_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/mailer/confirmation_instructions.html.haml', type: "view" do
-
context "logged in" do
before(:each) do
@resource = FactoryGirl.create(:member)
diff --git a/spec/views/devise/mailer/reset_password_instructions_spec.rb b/spec/views/devise/mailer/reset_password_instructions_spec.rb
index 91c46a696..7d0cdfe6a 100644
--- a/spec/views/devise/mailer/reset_password_instructions_spec.rb
+++ b/spec/views/devise/mailer/reset_password_instructions_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/mailer/reset_password_instructions.html.haml', type: "view" do
-
context "logged in" do
before(:each) do
@resource = mock_model(Member)
diff --git a/spec/views/devise/mailer/unlock_instructions_spec.rb b/spec/views/devise/mailer/unlock_instructions_spec.rb
index 5c90260c5..e0fb50e50 100644
--- a/spec/views/devise/mailer/unlock_instructions_spec.rb
+++ b/spec/views/devise/mailer/unlock_instructions_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/mailer/unlock_instructions.html.haml', type: "view" do
context "logged in" do
@@ -31,4 +27,3 @@ describe 'devise/mailer/unlock_instructions.html.haml', type: "view" do
end
end
end
-
diff --git a/spec/views/devise/registrations/edit_spec.rb b/spec/views/devise/registrations/edit_spec.rb
index 8fb096255..2aef2fa70 100644
--- a/spec/views/devise/registrations/edit_spec.rb
+++ b/spec/views/devise/registrations/edit_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/registrations/edit.html.haml', type: "view" do
-
context "logged in" do
before(:each) do
controller.stub(:current_user) { nil }
@@ -75,7 +70,6 @@ describe 'devise/registrations/edit.html.haml', type: "view" do
end
context 'other sites section' do
-
context 'not connected to twitter' do
it 'has a link to connect' do
render
@@ -115,9 +109,6 @@ describe 'devise/registrations/edit.html.haml', type: "view" do
assert_select "a", href: @flickr_auth, text: "Disconnect"
end
end
-
end
-
end
-
end
diff --git a/spec/views/devise/registrations/new_spec.rb b/spec/views/devise/registrations/new_spec.rb
index 5d6d8ac5a..be00abae9 100644
--- a/spec/views/devise/registrations/new_spec.rb
+++ b/spec/views/devise/registrations/new_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/registrations/new.html.haml', type: "view" do
-
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(Member.new)
@@ -28,7 +23,7 @@ describe 'devise/registrations/new.html.haml', type: "view" do
end
it 'should have some fields' do
- rendered.should have_content 'Email'
+ rendered.should have_content 'Email'
end
it 'has a checkbox for newsletter subscription' do
diff --git a/spec/views/devise/sessions/new_spec.rb b/spec/views/devise/sessions/new_spec.rb
index 674e92978..93b14b9c3 100644
--- a/spec/views/devise/sessions/new_spec.rb
+++ b/spec/views/devise/sessions/new_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/sessions/new.html.haml', type: "view" do
-
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(Member.new)
@@ -28,8 +23,8 @@ describe 'devise/sessions/new.html.haml', type: "view" do
end
it 'should have some fields' do
- rendered.should have_content 'Remember me'
- rendered.should have_content 'Password'
+ rendered.should have_content 'Remember me'
+ rendered.should have_content 'Password'
end
end
end
diff --git a/spec/views/devise/shared/_links_spec.rb b/spec/views/devise/shared/_links_spec.rb
index 7e71bbc12..c567339d6 100644
--- a/spec/views/devise/shared/_links_spec.rb
+++ b/spec/views/devise/shared/_links_spec.rb
@@ -1,5 +1,4 @@
describe 'devise/shared/_links.haml', type: "view" do
-
def devise_mapping(register, recover, confirm, lock, oauth)
dm = double("mappings")
dm.stub(registerable?: register)
@@ -13,14 +12,14 @@ describe 'devise/shared/_links.haml', type: "view" do
it 'should have a sign-in link if not in sessions' do
@view.stub(:controller_name).and_return("anything but sessions")
@view.stub(:resource_name).and_return("member")
- @view.stub(devise_mapping: devise_mapping(false, false, false, false, false))
+ @view.stub(devise_mapping: devise_mapping(false, false, false, false, false))
render
end
it "shouldn't have a sign-in link if in sessions" do
@view.stub(:controller_name).and_return("sessions")
@view.stub(:resource_name).and_return("member")
- @view.stub(devise_mapping: devise_mapping(false, false, false, false, false))
+ @view.stub(devise_mapping: devise_mapping(false, false, false, false, false))
render
end
end
diff --git a/spec/views/devise/unlocks/new_spec.rb b/spec/views/devise/unlocks/new_spec.rb
index e145900e4..c53968a8d 100644
--- a/spec/views/devise/unlocks/new_spec.rb
+++ b/spec/views/devise/unlocks/new_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'devise/unlocks/new.html.haml', type: "view" do
-
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(Member.new)
@@ -28,7 +23,7 @@ describe 'devise/unlocks/new.html.haml', type: "view" do
end
it 'should have some fields' do
- rendered.should have_content 'Email'
+ rendered.should have_content 'Email'
end
end
end
diff --git a/spec/views/forums/edit.html.haml_spec.rb b/spec/views/forums/edit.html.haml_spec.rb
index e3c874519..002a52f3e 100644
--- a/spec/views/forums/edit.html.haml_spec.rb
+++ b/spec/views/forums/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "forums/edit" do
diff --git a/spec/views/forums/index.html.haml_spec.rb b/spec/views/forums/index.html.haml_spec.rb
index dc1bdba58..701504d7f 100644
--- a/spec/views/forums/index.html.haml_spec.rb
+++ b/spec/views/forums/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "forums/index" do
@@ -22,7 +18,7 @@ describe "forums/index" do
controller.stub(:current_user) { @admin }
@forum1 = FactoryGirl.create(:forum)
@forum2 = FactoryGirl.create(:forum)
- assign(:forums, [ @forum1, @forum2 ])
+ assign(:forums, [@forum1, @forum2])
end
it "renders a list of forums" do
@@ -51,6 +47,5 @@ describe "forums/index" do
it "displays comment count" do
assert_select "td", text: "1"
end
-
end
end
diff --git a/spec/views/forums/new.html.haml_spec.rb b/spec/views/forums/new.html.haml_spec.rb
index 59988ae90..de0be5b3c 100644
--- a/spec/views/forums/new.html.haml_spec.rb
+++ b/spec/views/forums/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "forums/new" do
diff --git a/spec/views/forums/show.html.haml_spec.rb b/spec/views/forums/show.html.haml_spec.rb
index 77ed26382..f2fa920a6 100644
--- a/spec/views/forums/show.html.haml_spec.rb
+++ b/spec/views/forums/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "forums/show" do
diff --git a/spec/views/gardens/edit.html.haml_spec.rb b/spec/views/gardens/edit.html.haml_spec.rb
index 959600d77..f8b4b5e03 100644
--- a/spec/views/gardens/edit.html.haml_spec.rb
+++ b/spec/views/gardens/edit.html.haml_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "gardens/edit" do
-
context "logged in" do
before(:each) do
@owner = FactoryGirl.create(:member)
@@ -41,5 +36,4 @@ describe "gardens/edit" do
end
end
end
-
end
diff --git a/spec/views/gardens/new.html.haml_spec.rb b/spec/views/gardens/new.html.haml_spec.rb
index 84b689eb0..337b9066c 100644
--- a/spec/views/gardens/new.html.haml_spec.rb
+++ b/spec/views/gardens/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "gardens/new" do
diff --git a/spec/views/gardens/show.html.haml_spec.rb b/spec/views/gardens/show.html.haml_spec.rb
index dff7ebefa..0e166e453 100644
--- a/spec/views/gardens/show.html.haml_spec.rb
+++ b/spec/views/gardens/show.html.haml_spec.rb
@@ -1,24 +1,20 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "gardens/show" do
before(:each) do
- @owner = FactoryGirl.create(:member)
+ @owner = FactoryGirl.create(:member)
controller.stub(:current_user) { @owner }
@garden = FactoryGirl.create(:garden, owner: @owner)
@planting = FactoryGirl.create(:planting, garden: @garden)
@@ -51,7 +47,6 @@ describe "gardens/show" do
end
context 'signed in' do
-
before :each do
sign_in @owner
render
@@ -69,5 +64,4 @@ describe "gardens/show" do
assert_select("a[href='#{new_planting_path}?garden_id=#{@garden.id}']")
end
end
-
end
diff --git a/spec/views/harvests/edit.html.haml_spec.rb b/spec/views/harvests/edit.html.haml_spec.rb
index f318e3a79..e0959b451 100644
--- a/spec/views/harvests/edit.html.haml_spec.rb
+++ b/spec/views/harvests/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "harvests/edit" do
diff --git a/spec/views/harvests/index.html.haml_spec.rb b/spec/views/harvests/index.html.haml_spec.rb
index 923b3fb39..32baadc1a 100644
--- a/spec/views/harvests/index.html.haml_spec.rb
+++ b/spec/views/harvests/index.html.haml_spec.rb
@@ -1,25 +1,21 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "harvests/index" do
before(:each) do
controller.stub(:current_user) { nil }
- @member = FactoryGirl.create(:member)
+ @member = FactoryGirl.create(:member)
@tomato = FactoryGirl.create(:tomato)
@maize = FactoryGirl.create(:maize)
@pp = FactoryGirl.create(:plant_part)
@@ -28,16 +24,16 @@ describe "harvests/index" do
total_entries = 2
harvests = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
pager.replace([
- FactoryGirl.create(:harvest,
- crop: @tomato,
- owner: @member
- ),
- FactoryGirl.create(:harvest,
- crop: @maize,
- plant_part: @pp,
- owner: @member
- )
- ])
+ FactoryGirl.create(:harvest,
+ crop: @tomato,
+ owner: @member
+ ),
+ FactoryGirl.create(:harvest,
+ crop: @maize,
+ plant_part: @pp,
+ owner: @member
+ )
+ ])
end
assign(:harvests, harvests)
render
@@ -61,5 +57,4 @@ describe "harvests/index" do
render
view.content_for(:title).should have_content @tomato.name
end
-
end
diff --git a/spec/views/harvests/new.html.haml_spec.rb b/spec/views/harvests/new.html.haml_spec.rb
index 20a908310..1b300f1e3 100644
--- a/spec/views/harvests/new.html.haml_spec.rb
+++ b/spec/views/harvests/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "harvests/new" do
@@ -27,7 +23,7 @@ describe "harvests/new" do
assert_select "input#crop", class: "ui-autocomplete-input"
assert_select "input#harvest_crop_id", name: "harvest[crop_id]"
assert_select "select#harvest_plant_part_id", name: "harvest[plant_part_id]"
-# some browsers interpret without a step as "integer"
+ # some browsers interpret without a step as "integer"
assert_select "input#harvest_quantity[step=any]", name: "harvest[quantity]"
assert_select "input#harvest_weight_quantity[step=any]", name: "harvest[quantity]"
assert_select "select#harvest_unit", name: "harvest[unit]"
diff --git a/spec/views/harvests/show.html.haml_spec.rb b/spec/views/harvests/show.html.haml_spec.rb
index 91014941b..b6a1ec7a0 100644
--- a/spec/views/harvests/show.html.haml_spec.rb
+++ b/spec/views/harvests/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "harvests/show" do
@@ -29,5 +25,4 @@ describe "harvests/show" do
rendered.should have_content @harvest.harvested_at.to_s
rendered.should have_content @harvest.plant_part.to_s
end
-
end
diff --git a/spec/views/home/_blurb.html.haml_spec.rb b/spec/views/home/_blurb.html.haml_spec.rb
index 94e7550d1..710fcd4d4 100644
--- a/spec/views/home/_blurb.html.haml_spec.rb
+++ b/spec/views/home/_blurb.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'home/_blurb.html.haml', type: "view" do
@@ -37,5 +33,4 @@ describe 'home/_blurb.html.haml', type: "view" do
assert_select "a", href: new_member_session_path
end
end
-
end
diff --git a/spec/views/home/_crops.html.haml_spec.rb b/spec/views/home/_crops.html.haml_spec.rb
index 3009a7cc4..8f375f3e1 100644
--- a/spec/views/home/_crops.html.haml_spec.rb
+++ b/spec/views/home/_crops.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'home/_crops.html.haml', type: "view" do
diff --git a/spec/views/home/_members.html.haml_spec.rb b/spec/views/home/_members.html.haml_spec.rb
index f208c1bde..a4391da51 100644
--- a/spec/views/home/_members.html.haml_spec.rb
+++ b/spec/views/home/_members.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'home/_members.html.haml', type: "view" do
@@ -35,5 +31,4 @@ describe 'home/_members.html.haml', type: "view" do
rendered.should have_content @member.location
rendered.should have_content @planting.crop_name
end
-
end
diff --git a/spec/views/home/_seeds.html.haml_spec.rb b/spec/views/home/_seeds.html.haml_spec.rb
index 6cbd276f7..a904f47ff 100644
--- a/spec/views/home/_seeds.html.haml_spec.rb
+++ b/spec/views/home/_seeds.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'home/_seeds.html.haml', type: "view" do
diff --git a/spec/views/home/_stats.html.haml_spec.rb b/spec/views/home/_stats.html.haml_spec.rb
index 0eeaf66f8..6bfc3e6fe 100644
--- a/spec/views/home/_stats.html.haml_spec.rb
+++ b/spec/views/home/_stats.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'home/_stats.html.haml', type: "view" do
diff --git a/spec/views/home/index_spec.rb b/spec/views/home/index_spec.rb
index 84dd65bde..b5a726e23 100644
--- a/spec/views/home/index_spec.rb
+++ b/spec/views/home/index_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'home/index.html.haml', type: "view" do
@@ -57,5 +53,4 @@ describe 'home/index.html.haml', type: "view" do
rendered.should have_content "Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, #{@member.login_name}"
end
end
-
end
diff --git a/spec/views/layouts/_header_spec.rb b/spec/views/layouts/_header_spec.rb
index 8742796c1..2e6f8e36a 100644
--- a/spec/views/layouts/_header_spec.rb
+++ b/spec/views/layouts/_header_spec.rb
@@ -10,10 +10,6 @@
## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'layouts/_header.html.haml', type: "view" do
@@ -64,11 +60,9 @@ describe 'layouts/_header.html.haml', type: "view" do
assert_select("form[action='#{crops_search_path}']")
assert_select("input#term")
end
-
end
context "logged in" do
-
before(:each) do
@member = FactoryGirl.create(:member)
sign_in @member
@@ -110,6 +104,5 @@ describe 'layouts/_header.html.haml', type: "view" do
rendered.should have_content 'Inbox (1)'
end
end
-
end
end
diff --git a/spec/views/layouts/_meta_spec.rb b/spec/views/layouts/_meta_spec.rb
index 716429e37..805f0298d 100644
--- a/spec/views/layouts/_meta_spec.rb
+++ b/spec/views/layouts/_meta_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'layouts/_meta.html.haml', type: "view" do
@@ -39,5 +35,4 @@ describe 'layouts/_meta.html.haml', type: "view" do
it 'should have a title' do
assert_select "head>title"
end
-
end
diff --git a/spec/views/layouts/application_spec.rb b/spec/views/layouts/application_spec.rb
index af710ce6f..b773cce58 100644
--- a/spec/views/layouts/application_spec.rb
+++ b/spec/views/layouts/application_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'layouts/application.html.haml', type: "view" do
@@ -27,5 +23,4 @@ describe 'layouts/application.html.haml', type: "view" do
assert_select "script", text: 'alert("foo!")'
rendered.should_not have_content 'script'
end
-
end
diff --git a/spec/views/members/_location.html.haml_spec.rb b/spec/views/members/_location.html.haml_spec.rb
index 43fb66285..23beefc69 100644
--- a/spec/views/members/_location.html.haml_spec.rb
+++ b/spec/views/members/_location.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "members/_location" do
@@ -45,7 +41,5 @@ describe "members/_location" do
it "doesn't link anywhere" do
assert_select "a", false
end
-
end
-
end
diff --git a/spec/views/members/index.html.haml_spec.rb b/spec/views/members/index.html.haml_spec.rb
index ee1537b77..122b88b48 100644
--- a/spec/views/members/index.html.haml_spec.rb
+++ b/spec/views/members/index.html.haml_spec.rb
@@ -10,10 +10,6 @@
## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "members/index" do
@@ -24,7 +20,7 @@ describe "members/index" do
total_entries = 2
@member = FactoryGirl.create(:london_member)
members = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
- pager.replace([ @member, @member ])
+ pager.replace([@member, @member])
end
assign(:members, members)
render
@@ -37,5 +33,4 @@ describe "members/index" do
it 'contains member locations' do
rendered.should have_content @member.location
end
-
end
diff --git a/spec/views/members/show.rss.haml_spec.rb b/spec/views/members/show.rss.haml_spec.rb
index dcfa0b7b6..5a3320a8b 100644
--- a/spec/views/members/show.rss.haml_spec.rb
+++ b/spec/views/members/show.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'members/show.rss.haml', type: "view" do
@@ -34,13 +30,12 @@ describe 'members/show.rss.haml', type: "view" do
end
it 'renders post bodies to HTML and XML-escapes them' do
-# The variable "rendered" has been entity-replaced and tag-stripped
-# The literal string output contains "<strong>" etc.
+ # The variable "rendered" has been entity-replaced and tag-stripped
+ # The literal string output contains "<strong>" etc.
rendered.should have_content "strong"
end
it 'gives the author in the item title' do
rendered.should have_content "#{@post1.subject} by #{@post1.author}"
end
-
end
diff --git a/spec/views/notifications/index.html.haml_spec.rb b/spec/views/notifications/index.html.haml_spec.rb
index a7ec6a696..5e0f95beb 100644
--- a/spec/views/notifications/index.html.haml_spec.rb
+++ b/spec/views/notifications/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "notifications/index" do
@@ -25,12 +21,11 @@ describe "notifications/index" do
context "ordinary notifications" do
before(:each) do
@notification = FactoryGirl.create(:notification, sender: @member,
- recipient: @member)
- assign(:notifications, Kaminari.paginate_array([ @notification, @notification ]).page(1))
+ recipient: @member)
+ assign(:notifications, Kaminari.paginate_array([@notification, @notification]).page(1))
render
end
-
it "renders a list of notifications" do
assert_select "table"
assert_select "tr>td", text: @notification.sender.to_s, count: 2
@@ -45,7 +40,7 @@ describe "notifications/index" do
context "no subject" do
it "shows (no subject)" do
@notification = FactoryGirl.create(:notification,
- sender: @member, recipient: @member, subject: nil)
+ sender: @member, recipient: @member, subject: nil)
assign(:notifications, Kaminari.paginate_array([@notification]).page(1))
render
rendered.should have_content "(no subject)"
@@ -55,11 +50,10 @@ describe "notifications/index" do
context "whitespace-only subject" do
it "shows (no subject)" do
@notification = FactoryGirl.create(:notification,
- sender: @member, recipient: @member, subject: " ")
+ sender: @member, recipient: @member, subject: " ")
assign(:notifications, Kaminari.paginate_array([@notification]).page(1))
render
rendered.should have_content "(no subject)"
end
end
-
end
diff --git a/spec/views/notifications/new.html.haml_spec.rb b/spec/views/notifications/new.html.haml_spec.rb
index b2e6cd125..a5daa64f5 100644
--- a/spec/views/notifications/new.html.haml_spec.rb
+++ b/spec/views/notifications/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "notifications/new" do
@@ -22,7 +18,7 @@ describe "notifications/new" do
@sender = FactoryGirl.create(:member)
assign(:notification, FactoryGirl.create(:notification, recipient_id: @recipient.id, sender_id: @sender.id))
sign_in @sender
- controller.stub(:current_user) { @sender}
+ controller.stub(:current_user) { @sender }
end
it "renders new message form" do
@@ -63,5 +59,4 @@ describe "notifications/new" do
render
rendered.should have_content 'Markdown'
end
-
end
diff --git a/spec/views/notifications/show.html.haml_spec.rb b/spec/views/notifications/show.html.haml_spec.rb
index a0ca5ec8f..4d5a71dfc 100644
--- a/spec/views/notifications/show.html.haml_spec.rb
+++ b/spec/views/notifications/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "notifications/show" do
@@ -36,7 +32,6 @@ describe "notifications/show" do
end
it "includes a reply button" do
- assert_select "a", {href: @reply_link}, "Reply"
+ assert_select "a", { href: @reply_link }, "Reply"
end
-
end
diff --git a/spec/views/notifier/notify.html.haml_spec.rb b/spec/views/notifier/notify.html.haml_spec.rb
index 5a6c96116..e3a7cbdb4 100644
--- a/spec/views/notifier/notify.html.haml_spec.rb
+++ b/spec/views/notifier/notify.html.haml_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'notifier/notify.html.haml', type: "view" do
-
before(:each) do
@notification = FactoryGirl.create(:notification)
@reply_link = "http://example.com"
diff --git a/spec/views/orders/index.html.haml_spec.rb b/spec/views/orders/index.html.haml_spec.rb
index 297ac9ad4..38ab39362 100644
--- a/spec/views/orders/index.html.haml_spec.rb
+++ b/spec/views/orders/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "orders/index" do
@@ -22,7 +18,7 @@ describe "orders/index" do
sign_in @member
@order1 = FactoryGirl.create(:order, member: @member)
@order2 = FactoryGirl.create(:completed_order, member: @member)
- assign(:orders, [ @order1, @order2 ])
+ assign(:orders, [@order1, @order2])
end
it "shows your current account status" do
diff --git a/spec/views/orders/show.html.haml_spec.rb b/spec/views/orders/show.html.haml_spec.rb
index 10fd2f5d7..b6c3da53b 100644
--- a/spec/views/orders/show.html.haml_spec.rb
+++ b/spec/views/orders/show.html.haml_spec.rb
@@ -1,23 +1,18 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "orders/show" do
-
before(:each) do
@member = FactoryGirl.create(:member)
sign_in @member
@@ -84,7 +79,5 @@ describe "orders/show" do
it "doesn't show delete order button" do
assert_select "a", text: "Delete this order", count: 0
end
-
end
-
end
diff --git a/spec/views/photos/edit.html.haml_spec.rb b/spec/views/photos/edit.html.haml_spec.rb
index 6df82b418..5ff07030b 100644
--- a/spec/views/photos/edit.html.haml_spec.rb
+++ b/spec/views/photos/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "photos/edit" do
@@ -25,5 +21,4 @@ describe "photos/edit" do
fullsize_url: "MyString"
))
end
-
end
diff --git a/spec/views/photos/index.html.haml_spec.rb b/spec/views/photos/index.html.haml_spec.rb
index 1741d9aa3..a59e4eb2c 100644
--- a/spec/views/photos/index.html.haml_spec.rb
+++ b/spec/views/photos/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "photos/index" do
@@ -23,9 +19,9 @@ describe "photos/index" do
total_entries = 2
photos = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
pager.replace([
- FactoryGirl.create(:photo),
- FactoryGirl.create(:photo)
- ])
+ FactoryGirl.create(:photo),
+ FactoryGirl.create(:photo)
+ ])
end
assign(:photos, photos)
end
diff --git a/spec/views/photos/new.html.haml_spec.rb b/spec/views/photos/new.html.haml_spec.rb
index 47df538b4..dab06e8b0 100644
--- a/spec/views/photos/new.html.haml_spec.rb
+++ b/spec/views/photos/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "photos/new" do
@@ -39,7 +35,7 @@ describe "photos/new" do
context "user has photosets" do
before(:each) do
- assign(:sets, {"foo" => "bar"}) # Hash of names => IDs
+ assign(:sets, { "foo" => "bar" }) # Hash of names => IDs
end
it "shows a dropdown with sets from Flickr" do
@@ -48,10 +44,9 @@ describe "photos/new" do
end
it "shows the current photoset" do
- assign(:current_set, "bar") # the ID of the set
+ assign(:current_set, "bar") # the ID of the set
render
assert_select "h2", "foo" # the name of the set
end
end
-
end
diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb
index 055032f76..2a2e7afeb 100644
--- a/spec/views/photos/show.html.haml_spec.rb
+++ b/spec/views/photos/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "photos/show" do
@@ -38,7 +34,7 @@ describe "photos/show" do
it "links to the CC license" do
assert_select "a", href: @photo.license_url,
- text: @photo.license_name
+ text: @photo.license_name
end
it "shows a link to the original image" do
@@ -59,7 +55,5 @@ describe "photos/show" do
it "contains the phrase 'All rights reserved'" do
rendered.should have_content "All rights reserved"
end
-
end
-
end
diff --git a/spec/views/places/_map_attribution.html.haml_spec.rb b/spec/views/places/_map_attribution.html.haml_spec.rb
index cbb305ed6..efc101bc1 100644
--- a/spec/views/places/_map_attribution.html.haml_spec.rb
+++ b/spec/views/places/_map_attribution.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "places/_map_attribution.html.haml", type: :view do
@@ -23,12 +19,12 @@ describe "places/_map_attribution.html.haml", type: :view do
it "links to OpenStreetMap" do
assert_select "a", href: "http://openstreetmap.org",
- text: "OpenStreetMap"
+ text: "OpenStreetMap"
end
it "links to the ODbL" do
assert_select "a", href: "http://www.openstreetmap.org/copyright",
- text: "ODbL"
+ text: "ODbL"
end
it "links to CloudMade" do
diff --git a/spec/views/places/index.html.haml_spec.rb b/spec/views/places/index.html.haml_spec.rb
index 10c5caca6..44299c286 100644
--- a/spec/views/places/index.html.haml_spec.rb
+++ b/spec/views/places/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "places/index" do
diff --git a/spec/views/places/show.html.haml_spec.rb b/spec/views/places/show.html.haml_spec.rb
index 7cfa2c16c..57f7e9742 100644
--- a/spec/views/places/show.html.haml_spec.rb
+++ b/spec/views/places/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "places/show" do
@@ -39,5 +35,4 @@ describe "places/show" do
rendered.should have_content m.login_name
end
end
-
end
diff --git a/spec/views/plant_parts/edit.html.haml_spec.rb b/spec/views/plant_parts/edit.html.haml_spec.rb
index 1f92923d8..2eeb4e535 100644
--- a/spec/views/plant_parts/edit.html.haml_spec.rb
+++ b/spec/views/plant_parts/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plant_parts/edit" do
diff --git a/spec/views/plant_parts/index.html.haml_spec.rb b/spec/views/plant_parts/index.html.haml_spec.rb
index 1fe26abba..adb0f9a46 100644
--- a/spec/views/plant_parts/index.html.haml_spec.rb
+++ b/spec/views/plant_parts/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plant_parts/index" do
@@ -28,5 +24,4 @@ describe "plant_parts/index" do
rendered.should have_content @pp.name
assert_select "a", href: plant_part_path(@pp)
end
-
end
diff --git a/spec/views/plant_parts/new.html.haml_spec.rb b/spec/views/plant_parts/new.html.haml_spec.rb
index 213eee57a..e25ba2da1 100644
--- a/spec/views/plant_parts/new.html.haml_spec.rb
+++ b/spec/views/plant_parts/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plant_parts/new" do
diff --git a/spec/views/plant_parts/show.html.haml_spec.rb b/spec/views/plant_parts/show.html.haml_spec.rb
index 7c23b9bb9..8b267c449 100644
--- a/spec/views/plant_parts/show.html.haml_spec.rb
+++ b/spec/views/plant_parts/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plant_parts/show" do
@@ -32,4 +28,3 @@ describe "plant_parts/show" do
end
end
end
-
diff --git a/spec/views/plantings/_form.html.haml_spec.rb b/spec/views/plantings/_form.html.haml_spec.rb
index 0d813b678..1ba3be93e 100644
--- a/spec/views/plantings/_form.html.haml_spec.rb
+++ b/spec/views/plantings/_form.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plantings/_form" do
@@ -36,6 +32,4 @@ describe "plantings/_form" do
it "has a free-form text field containing the planting date in ISO format" do
assert_select "input#planting_planted_at[type='text'][value='2013-03-01']"
end
-
end
-
diff --git a/spec/views/plantings/edit.html.haml_spec.rb b/spec/views/plantings/edit.html.haml_spec.rb
index 24b0b81ce..1ea5fc586 100644
--- a/spec/views/plantings/edit.html.haml_spec.rb
+++ b/spec/views/plantings/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plantings/edit" do
@@ -35,7 +31,6 @@ describe "plantings/edit" do
@planting = assign(:planting,
FactoryGirl.create(:planting, garden: @garden, crop: @tomato)
)
-
end
context "logged in" do
@@ -66,6 +61,5 @@ describe "plantings/edit" do
assert_select "select#planting_garden_id",
html: /option selected value="#{@garden.id}"/
end
-
end
end
diff --git a/spec/views/plantings/index.html.haml_spec.rb b/spec/views/plantings/index.html.haml_spec.rb
index 928735dde..54f2bb63a 100644
--- a/spec/views/plantings/index.html.haml_spec.rb
+++ b/spec/views/plantings/index.html.haml_spec.rb
@@ -1,25 +1,21 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plantings/index" do
before(:each) do
controller.stub(:current_user) { nil }
- @member = FactoryGirl.create(:member)
+ @member = FactoryGirl.create(:member)
@garden = FactoryGirl.create(:garden, owner: @member)
@tomato = FactoryGirl.create(:tomato)
@maize = FactoryGirl.create(:maize)
@@ -28,25 +24,25 @@ describe "plantings/index" do
total_entries = 3
plantings = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
pager.replace([
- FactoryGirl.create(:planting,
- garden: @garden,
- crop: @tomato,
- owner: @member
- ),
- FactoryGirl.create(:planting,
- garden: @garden,
- crop: @maize,
- description: '',
- planted_at: Time.local(2013, 1, 13)
- ),
- FactoryGirl.create(:planting,
- garden: @garden,
- crop: @tomato,
- planted_at: Time.local(2013, 1, 13),
- finished_at: Time.local(2013, 1, 20),
- finished: true
- )
- ])
+ FactoryGirl.create(:planting,
+ garden: @garden,
+ crop: @tomato,
+ owner: @member
+ ),
+ FactoryGirl.create(:planting,
+ garden: @garden,
+ crop: @maize,
+ description: '',
+ planted_at: Time.local(2013, 1, 13)
+ ),
+ FactoryGirl.create(:planting,
+ garden: @garden,
+ crop: @tomato,
+ planted_at: Time.local(2013, 1, 13),
+ finished_at: Time.local(2013, 1, 20),
+ finished: true
+ )
+ ])
end
assign(:plantings, plantings)
render
diff --git a/spec/views/plantings/index.rss.haml_spec.rb b/spec/views/plantings/index.rss.haml_spec.rb
index 9f3d7ccc1..58a4a2996 100644
--- a/spec/views/plantings/index.rss.haml_spec.rb
+++ b/spec/views/plantings/index.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'plantings/index.rss.haml' do
@@ -54,7 +50,7 @@ describe 'plantings/index.rss.haml' do
context "one person's plantings" do
before :each do
@planting = FactoryGirl.create(:planting)
- assign(:plantings, [@planting ])
+ assign(:plantings, [@planting])
assign(:owner, @planting.owner)
render
end
diff --git a/spec/views/plantings/new.html.haml_spec.rb b/spec/views/plantings/new.html.haml_spec.rb
index 825d64c5b..2fadcf38b 100644
--- a/spec/views/plantings/new.html.haml_spec.rb
+++ b/spec/views/plantings/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plantings/new" do
@@ -31,7 +27,6 @@ describe "plantings/new" do
garden: @garden_a,
crop: @crop2
))
-
end
context "logged in" do
diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb
index f04604722..e89d6bb92 100644
--- a/spec/views/plantings/show.html.haml_spec.rb
+++ b/spec/views/plantings/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "plantings/show" do
@@ -22,7 +18,7 @@ describe "plantings/show" do
@crop = FactoryGirl.create(:tomato)
@planting = assign(:planting,
FactoryGirl.create(:planting, garden: @garden, crop: @crop,
- planted_from: 'cutting')
+ planted_from: 'cutting')
)
end
diff --git a/spec/views/posts/_single.html.haml_spec.rb b/spec/views/posts/_single.html.haml_spec.rb
index eabef90fe..656a4194b 100644
--- a/spec/views/posts/_single.html.haml_spec.rb
+++ b/spec/views/posts/_single.html.haml_spec.rb
@@ -1,25 +1,20 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "posts/_single" do
-
def render_post()
- render partial: "single", locals: { post: @post }
+ render partial: "single", locals: { post: @post }
end
before(:each) do
@@ -37,7 +32,7 @@ describe "posts/_single" do
end
it "doesn't contain a link to new comment" do
- assert_select("a", {href: new_comment_path(post_id: @post.id)}, false)
+ assert_select("a", { href: new_comment_path(post_id: @post.id) }, false)
end
end
@@ -50,7 +45,7 @@ describe "posts/_single" do
end
it "contains link to new comment" do
- assert_select("a", {href: new_comment_path(post_id: @post.id)}, "Reply")
+ assert_select("a", { href: new_comment_path(post_id: @post.id) }, "Reply")
end
it "does not contain an edit link" do
@@ -121,13 +116,12 @@ describe "posts/_single" do
end
it "does not contain link to post" do
- assert_select "a[href='#{post_path @post}']", false
+ assert_select "a[href='#{post_path @post}']", false
end
it "does not contain link to new comment" do
assert_select "a[href='#{new_comment_path(post_id: @post.id)}']", false
end
-
end
context "when post has been edited" do
@@ -199,5 +193,4 @@ describe "posts/_single" do
rendered.should_not have_content "edited at #{@comment.updated_at}"
end
end
-
end
diff --git a/spec/views/posts/edit.html.haml_spec.rb b/spec/views/posts/edit.html.haml_spec.rb
index bf48f9d88..d3342f5b9 100644
--- a/spec/views/posts/edit.html.haml_spec.rb
+++ b/spec/views/posts/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "posts/edit" do
@@ -47,7 +43,7 @@ describe "posts/edit" do
context "forum specified" do
before(:each) do
@forum = assign(:forum, FactoryGirl.create(:forum))
- assign(:post, FactoryGirl.create( :post,
+ assign(:post, FactoryGirl.create(:post,
forum: @forum,
author: @author
))
@@ -62,6 +58,5 @@ describe "posts/edit" do
rendered.should have_content "This post will be posted in the forum #{@forum.name}"
end
end
-
end
end
diff --git a/spec/views/posts/index.html.haml_spec.rb b/spec/views/posts/index.html.haml_spec.rb
index 1290cc2c7..731be8ea8 100644
--- a/spec/views/posts/index.html.haml_spec.rb
+++ b/spec/views/posts/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "posts/index" do
@@ -25,9 +21,9 @@ describe "posts/index" do
total_entries = 2
posts = WillPaginate::Collection.create(page, per_page, total_entries) do |pager|
pager.replace([
- FactoryGirl.create(:post, author: @author),
- FactoryGirl.create(:post, author: @author)
- ])
+ FactoryGirl.create(:post, author: @author),
+ FactoryGirl.create(:post, author: @author)
+ ])
end
assign(:posts, posts)
render
diff --git a/spec/views/posts/index.rss.haml_spec.rb b/spec/views/posts/index.rss.haml_spec.rb
index 496311efc..a5ee08423 100644
--- a/spec/views/posts/index.rss.haml_spec.rb
+++ b/spec/views/posts/index.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'posts/index.rss.haml', type: "view" do
@@ -37,5 +33,4 @@ describe 'posts/index.rss.haml', type: "view" do
it 'gives the author in the item title' do
rendered.should have_content "#{@post1.subject} by #{@post1.author}"
end
-
end
diff --git a/spec/views/posts/new.html.haml_spec.rb b/spec/views/posts/new.html.haml_spec.rb
index 6352ffabb..53c01fa35 100644
--- a/spec/views/posts/new.html.haml_spec.rb
+++ b/spec/views/posts/new.html.haml_spec.rb
@@ -1,26 +1,22 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "posts/new" do
before(:each) do
@author = FactoryGirl.create(:member)
assign(:post, FactoryGirl.create(:post, author: @author))
-# assign(:forum, Forum.new)
+ # assign(:forum, Forum.new)
sign_in @author
controller.stub(:current_user) { @author }
end
@@ -74,5 +70,4 @@ describe "posts/new" do
render
rendered.should have_content 'Markdown'
end
-
end
diff --git a/spec/views/posts/show.html.haml_spec.rb b/spec/views/posts/show.html.haml_spec.rb
index b50812078..9564e7ee8 100644
--- a/spec/views/posts/show.html.haml_spec.rb
+++ b/spec/views/posts/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "posts/show" do
@@ -52,7 +48,7 @@ describe "posts/show" do
it 'has an anchor to the comments' do
@post = assign(:post,
- FactoryGirl.create(:post, author: @author))
+ FactoryGirl.create(:post, author: @author))
render
assert_select 'a[name=comments]'
end
@@ -60,7 +56,7 @@ describe "posts/show" do
context "when there is one comment" do
before(:each) do
@post = assign(:post,
- FactoryGirl.create(:html_post, author: @author))
+ FactoryGirl.create(:html_post, author: @author))
@comment = FactoryGirl.create(:comment, post: @post)
@comments = @post.comments
render
@@ -82,14 +78,14 @@ describe "posts/show" do
context "when there is more than one comment" do
before(:each) do
@post = assign(:post,
- FactoryGirl.create(:html_post, author: @author))
+ FactoryGirl.create(:html_post, author: @author))
@comment1 = FactoryGirl.create(:comment, post: @post, body: "F1rst!!!",
- created_at: Date.new(2010, 5, 17))
+ created_at: Date.new(2010, 5, 17))
@comment3 = FactoryGirl.create(:comment, post: @post, body: "Th1rd!!!",
- created_at: Date.new(2012, 5, 17))
+ created_at: Date.new(2012, 5, 17))
@comment4 = FactoryGirl.create(:comment, post: @post, body: "F0urth!!!")
@comment2 = FactoryGirl.create(:comment, post: @post, body: "S3c0nd!!1!",
- created_at: Date.new(2011, 5, 17))
+ created_at: Date.new(2011, 5, 17))
@comments = @post.comments
render
end
@@ -107,7 +103,7 @@ describe "posts/show" do
rendered.should have_content "in #{@post.forum.name}"
end
end
-
+
context "signed in" do
before(:each) do
sign_in @author
@@ -118,9 +114,7 @@ describe "posts/show" do
end
it 'shows a comment button' do
- assert_select "a", {href: new_comment_path(post_id: @post.id)}, "Comment"
- end
-
+ assert_select "a", { href: new_comment_path(post_id: @post.id) }, "Comment"
+ end
end
-
end
diff --git a/spec/views/posts/show.rss.haml_spec.rb b/spec/views/posts/show.rss.haml_spec.rb
index abe9b81f4..7fd1d8891 100644
--- a/spec/views/posts/show.rss.haml_spec.rb
+++ b/spec/views/posts/show.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'posts/show.rss.haml' do
@@ -43,5 +39,4 @@ describe 'posts/show.rss.haml' do
it 'shows content of comments' do
rendered.should have_content "OMG LOL"
end
-
end
diff --git a/spec/views/products/edit.html.haml_spec.rb b/spec/views/products/edit.html.haml_spec.rb
index 107a32284..cb8269d9c 100644
--- a/spec/views/products/edit.html.haml_spec.rb
+++ b/spec/views/products/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "products/edit" do
diff --git a/spec/views/products/index.html.haml_spec.rb b/spec/views/products/index.html.haml_spec.rb
index 576e6d3ec..f69492169 100644
--- a/spec/views/products/index.html.haml_spec.rb
+++ b/spec/views/products/index.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "products/index" do
diff --git a/spec/views/products/new.html.haml_spec.rb b/spec/views/products/new.html.haml_spec.rb
index db20a5c95..172cdf2ee 100644
--- a/spec/views/products/new.html.haml_spec.rb
+++ b/spec/views/products/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "products/new" do
diff --git a/spec/views/products/show.html.haml_spec.rb b/spec/views/products/show.html.haml_spec.rb
index 6fcb35654..2aeffa783 100644
--- a/spec/views/products/show.html.haml_spec.rb
+++ b/spec/views/products/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "products/show" do
diff --git a/spec/views/roles/edit.html.haml_spec.rb b/spec/views/roles/edit.html.haml_spec.rb
index a4026f63e..44e32b306 100644
--- a/spec/views/roles/edit.html.haml_spec.rb
+++ b/spec/views/roles/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "roles/edit" do
diff --git a/spec/views/roles/index.html.haml_spec.rb b/spec/views/roles/index.html.haml_spec.rb
index fe8e40333..00aca2be7 100644
--- a/spec/views/roles/index.html.haml_spec.rb
+++ b/spec/views/roles/index.html.haml_spec.rb
@@ -1,34 +1,30 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "roles/index" do
before(:each) do
controller.stub(:current_user) { nil }
assign(:roles, [
- stub_model(Role,
- name: "Name",
- description: "MyText"
- ),
- stub_model(Role,
- name: "Name",
- description: "MyText"
- )
- ])
+ stub_model(Role,
+ name: "Name",
+ description: "MyText"
+ ),
+ stub_model(Role,
+ name: "Name",
+ description: "MyText"
+ )
+ ])
end
it "renders a list of roles" do
diff --git a/spec/views/roles/new.html.haml_spec.rb b/spec/views/roles/new.html.haml_spec.rb
index 01dcd4c60..e884d6e64 100644
--- a/spec/views/roles/new.html.haml_spec.rb
+++ b/spec/views/roles/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "roles/new" do
diff --git a/spec/views/roles/show.html.haml_spec.rb b/spec/views/roles/show.html.haml_spec.rb
index cc0eb506e..cb208b487 100644
--- a/spec/views/roles/show.html.haml_spec.rb
+++ b/spec/views/roles/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "roles/show" do
diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb
index 09ff5125b..e3aad3288 100644
--- a/spec/views/scientific_names/edit.html.haml_spec.rb
+++ b/spec/views/scientific_names/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "scientific_names/edit" do
@@ -28,9 +24,9 @@ describe "scientific_names/edit" do
render
end
- it "shows the creator" do
- rendered.should have_content "Added by #{@scientific_name.creator} less than a minute ago."
- end
+ it "shows the creator" do
+ rendered.should have_content "Added by #{@scientific_name.creator} less than a minute ago."
+ end
it "renders the edit scientific_name form" do
assert_select "form", action: scientific_names_path(@scientific_name), method: "post" do
@@ -39,5 +35,4 @@ describe "scientific_names/edit" do
end
end
end
-
end
diff --git a/spec/views/scientific_names/index.html.haml_spec.rb b/spec/views/scientific_names/index.html.haml_spec.rb
index ea89ae101..feb4d3535 100644
--- a/spec/views/scientific_names/index.html.haml_spec.rb
+++ b/spec/views/scientific_names/index.html.haml_spec.rb
@@ -1,28 +1,24 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "scientific_names/index" do
before(:each) do
controller.stub(:current_user) { nil }
assign(:scientific_names, [
- FactoryGirl.create(:zea_mays),
- FactoryGirl.create(:solanum_lycopersicum)
- ])
+ FactoryGirl.create(:zea_mays),
+ FactoryGirl.create(:solanum_lycopersicum)
+ ])
end
it "renders a list of scientific_names" do
diff --git a/spec/views/scientific_names/new.html.haml_spec.rb b/spec/views/scientific_names/new.html.haml_spec.rb
index a8ad3f615..90bbcd8e5 100644
--- a/spec/views/scientific_names/new.html.haml_spec.rb
+++ b/spec/views/scientific_names/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "scientific_names/new" do
@@ -37,7 +33,5 @@ describe "scientific_names/new" do
assert_select "select#scientific_name_crop_id", name: "scientific_name[crop_id]"
end
end
-
end
-
end
diff --git a/spec/views/scientific_names/show.html.haml_spec.rb b/spec/views/scientific_names/show.html.haml_spec.rb
index a36646658..d044bfbcc 100644
--- a/spec/views/scientific_names/show.html.haml_spec.rb
+++ b/spec/views/scientific_names/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "scientific_names/show" do
@@ -31,7 +27,6 @@ describe "scientific_names/show" do
end
context 'signed in' do
-
before :each do
@wrangler = FactoryGirl.create(:crop_wrangling_member)
sign_in @wrangler
diff --git a/spec/views/seeds/edit.html.haml_spec.rb b/spec/views/seeds/edit.html.haml_spec.rb
index 1c9911afa..9ed744295 100644
--- a/spec/views/seeds/edit.html.haml_spec.rb
+++ b/spec/views/seeds/edit.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "seeds/edit" do
diff --git a/spec/views/seeds/index.rss.haml_spec.rb b/spec/views/seeds/index.rss.haml_spec.rb
index 5e88fc014..a90394084 100644
--- a/spec/views/seeds/index.rss.haml_spec.rb
+++ b/spec/views/seeds/index.rss.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'seeds/index.rss.haml' do
@@ -25,7 +21,7 @@ describe 'seeds/index.rss.haml' do
before(:each) do
@seed = FactoryGirl.create(:seed)
@tradable = FactoryGirl.create(:tradable_seed)
- assign(:seeds, [ @seed, @tradable ])
+ assign(:seeds, [@seed, @tradable])
render
end
@@ -42,19 +38,18 @@ describe 'seeds/index.rss.haml' do
end
it 'shows the plant_before date' do
- rendered.should have_content "Plant before: #{@seed.plant_before.to_s}"
+ rendered.should have_content "Plant before: #{@seed.plant_before}"
end
it 'mentions that one seed is tradable' do
rendered.should have_content "Will trade #{@tradable.tradable_to} from #{@tradable.owner.location}"
end
-
end
context "one member's seeds" do
before(:each) do
@seed = FactoryGirl.create(:seed)
- assign(:seeds, [ @seed ])
+ assign(:seeds, [@seed])
assign(:owner, @seed.owner)
render
end
diff --git a/spec/views/seeds/new.html.haml_spec.rb b/spec/views/seeds/new.html.haml_spec.rb
index 2f20412fa..2cc82f641 100644
--- a/spec/views/seeds/new.html.haml_spec.rb
+++ b/spec/views/seeds/new.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "seeds/new" do
@@ -62,5 +58,4 @@ describe "seeds/new" do
assert_select "a", text: "Change your location."
end
end
-
end
diff --git a/spec/views/seeds/show.html.haml_spec.rb b/spec/views/seeds/show.html.haml_spec.rb
index 88f4f32d5..c970a2518 100644
--- a/spec/views/seeds/show.html.haml_spec.rb
+++ b/spec/views/seeds/show.html.haml_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe "seeds/show" do
@@ -73,6 +69,5 @@ describe "seeds/show" do
render
rendered.should have_content "Request seeds"
end
-
end
end
diff --git a/spec/views/shop/index_spec.rb b/spec/views/shop/index_spec.rb
index c574f2ac4..736168b63 100644
--- a/spec/views/shop/index_spec.rb
+++ b/spec/views/shop/index_spec.rb
@@ -1,19 +1,15 @@
## DEPRECATION NOTICE: Do not add new tests to this file!
##
-## View and controller tests are deprecated in the Growstuff project.
-## We no longer write new view and controller tests, but instead write
-## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
-## These test the full stack, behaving as a browser, and require less complicated setup
-## to run. Please feel free to delete old view/controller tests as they are reimplemented
-## in feature tests.
+## View and controller tests are deprecated in the Growstuff project.
+## We no longer write new view and controller tests, but instead write
+## feature tests (in spec/features) using Capybara (https://github.com/jnicklas/capybara).
+## These test the full stack, behaving as a browser, and require less complicated setup
+## to run. Please feel free to delete old view/controller tests as they are reimplemented
+## in feature tests.
##
-## If you submit a pull request containing new view or controller tests, it will not be
+## If you submit a pull request containing new view or controller tests, it will not be
## merged.
-
-
-
-
require 'rails_helper'
describe 'shop/index.html.haml', type: "view" do
@@ -83,7 +79,6 @@ describe 'shop/index.html.haml', type: "view" do
render
assert_select "form", false
end
-
end
context "signed out" do
@@ -96,5 +91,4 @@ describe 'shop/index.html.haml', type: "view" do
rendered.should have_content "sign in or sign up"
end
end
-
end