Fix minor stylistic complaints

3 files changed, 38 insertions, 39 deletions

diff --git a/app/assets/javascripts/new_branch_form.js.coffee b/app/assets/javascripts/new_branch_form.js.coffee
index 23a5b333b8a..4b350854f78 100644
--- a/app/assets/javascripts/new_branch_form.js.coffee
+++ b/app/assets/javascripts/new_branch_form.js.coffee
@@ -13,13 +13,12 @@ class @NewBranchForm
     @name.on 'blur', @validate
 
   init: ->
-    @name.trigger 'blur'if @name.val().length > 0
+    @name.trigger 'blur' if @name.val().length > 0
 
   setupAvailableRefs: (availableRefs) ->
-    @ref.autocomplete {
+    @ref.autocomplete
       source: availableRefs,
       minLength: 1
-    }
 
   setupRestrictions: ->
     startsWith = {
@@ -36,7 +35,7 @@ class @NewBranchForm
 
     invalid = {
       pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g
-      prefix: "can't contains",
+      prefix: "can't contain",
       conjunction: ", "
     }
 
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb
index 109d031d446..0a42931147d 100644
--- a/features/steps/project/commits/branches.rb
+++ b/features/steps/project/commits/branches.rb
@@ -62,7 +62,7 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
 
   step 'I should see new an error that branch is invalid' do
     expect(page).to have_content 'Branch name is invalid'
-    expect(page).to have_content "can't contains spaces"
+    expect(page).to have_content "can't contain spaces"
   end
 
   step 'I should see new an error that ref is invalid' do
diff --git a/spec/javascripts/new_branch_spec.js.coffee b/spec/javascripts/new_branch_spec.js.coffee
index 1cba9546655..ea479239957 100644
--- a/spec/javascripts/new_branch_spec.js.coffee
+++ b/spec/javascripts/new_branch_spec.js.coffee
@@ -22,91 +22,91 @@ describe 'Branch', ->
 
     it "can't have two consecutive dots", ->
       @name.val('foo..bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '..'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '..'")
 
     it "can't have spaces anywhere", ->
       @name.val(' foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains spaces")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain spaces")
       @name.val('foo bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains spaces")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain spaces")
       @name.val('foo ').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains spaces")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain spaces")
 
     it "can't have ~ anywhere", ->
       @name.val('~foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '~'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '~'")
       @name.val('foo~bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '~'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '~'")
       @name.val('foo~').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '~'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '~'")
 
     it "can't have tilde anwhere", ->
       @name.val('~foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '~'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '~'")
       @name.val('foo~bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '~'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '~'")
       @name.val('foo~').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '~'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '~'")
 
     it "can't have caret anywhere", ->
       @name.val('^foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '^'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '^'")
       @name.val('foo^bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '^'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '^'")
       @name.val('foo^').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '^'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '^'")
 
     it "can't have : anywhere", ->
       @name.val(':foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains ':'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain ':'")
       @name.val('foo:bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains ':'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain ':'")
       @name.val(':foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains ':'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain ':'")
 
     it "can't have question mark anywhere", ->
       @name.val('?foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '?'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '?'")
       @name.val('foo?bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '?'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '?'")
       @name.val('foo?').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '?'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '?'")
 
     it "can't have asterisk anywhere", ->
       @name.val('*foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '*'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '*'")
       @name.val('foo*bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '*'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '*'")
       @name.val('foo*').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '*'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '*'")
 
     it "can't have open bracket anywhere", ->
       @name.val('[foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '['")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '['")
       @name.val('foo[bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '['")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '['")
       @name.val('foo[').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '['")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '['")
 
     it "can't have a backslash anywhere", ->
       @name.val('\\foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '\\'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '\\'")
       @name.val('foo\\bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '\\'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '\\'")
       @name.val('foo\\').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '\\'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '\\'")
 
     it "can't contain a sequence @{ anywhere", ->
       @name.val('@{foo').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '@{'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '@{'")
       @name.val('foo@{bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '@{'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '@{'")
       @name.val('foo@{').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '@{'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '@{'")
 
     it "can't have consecutive slashes", ->
       @name.val('foo//bar').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains consecutive slashes")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain consecutive slashes")
 
     it "can't end with a slash", ->
       @name.val('foo/').trigger('blur')
@@ -126,11 +126,11 @@ describe 'Branch', ->
 
     it "concatenates all error messages", ->
       @name.val('/foo bar?~.').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't start with '/', can't contains spaces, '?', '~', can't end in '.'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't start with '/', can't contain spaces, '?', '~', can't end in '.'")
 
     it "doesn't duplicate error messages", ->
       @name.val('?foo?bar?zoo?').trigger('blur')
-      expect($('.js-branch-name-error span').text()).toEqual("can't contains '?'")
+      expect($('.js-branch-name-error span').text()).toEqual("can't contain '?'")
 
     it "removes the error message when is a valid name", ->
       @name.val('foo?bar').trigger('blur')