Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add validation to Github name validation #259 #352

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add validation to Github name validation #259 #352

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b4941a
Add validation to Github name validation
thefenry Feb 27, 2015
0bc48de
Modify the organization model and organization rspec test
thefenry Mar 2, 2015
59591b9
Changed the project spec so it includes the required github org
thefenry Mar 2, 2015
e12af54
Modify spec to appease houndci requirements
thefenry Mar 2, 2015
712e33d
Modify spec per houndci
thefenry Mar 2, 2015
6d317e2
Merge branch 'master' of git://github.com/CodeMontageHQ/codemontage i…
thefenry Mar 9, 2015
5a63b26
Modify the organization mvc to use client side validation for org_git…
thefenry Mar 9, 2015
b3a58d1
Modify spec so it validates both public and admin submissions and spl…
thefenry Mar 9, 2015
954d677
undid the line break since hound is clomplaining of trailing white space
thefenry Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/organizations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class OrganizationsController < ApplicationController
def new
@organization = Organization.new
@organization.is_public_submission = current_user.is_admin unless current_user.nil?
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long. [87/80]

@project = @organization.projects.build(params[:projects])
end

Expand Down
4 changes: 2 additions & 2 deletions app/models/organization.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class Organization < ActiveRecord::Base
attr_writer :logo_delete
attr_accessor :is_public_submission

validates_presence_of :name
validates_presence_of :github_org, if: :is_public_submission
validates :name, presence: true
validates :github_org, presence: true, unless: :is_public_submission

# Paperclip
has_attached_file :logo, styles: { thumb: '100x100>', medium: '250x250>' },
Expand Down
2 changes: 1 addition & 1 deletion app/views/organizations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<%= f.input :name, :label => 'Organization Name', error_html: { class: "error" } %>
<div class="row">
<%= f.input :github_org, :label => 'Organization GitHub Username', :required => true, wrapper_html: { class: 'large-6 columns'}, error_html: { class: "error"} %>
<%= f.input :github_org, validate: true, :label => 'Organization GitHub Username', :required => true, wrapper_html: { class: 'large-6 columns'}, error_html: { class: "error"} %>
<%= f.input :url, :label => 'Organization Website', :required => false, :as => :url, wrapper_html: { class: 'large-6 columns'} %>
</div>
<div class="row">
Expand Down
4 changes: 2 additions & 2 deletions spec/models/organization_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

context 'if not public submission' do
before { subject.stub(:is_public_submission) { false } }
it { should_not validate_presence_of(:github_org) }
it { should validate_presence_of(:github_org) }
end

context 'if not public submission, implicit' do
it { should_not validate_presence_of(:github_org) }
it { should validate_presence_of(:github_org) }
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/models/project_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
end

describe '#related_projects' do
let(:organization) { Organization.create!(name: 'CodeMontage') }
let(:organization) { Organization.create!(name: "CodeMontage", github_org: "codeMontage") }

before do
@project_1 = Project.create!(name: 'Code Montage', organization_id: organization.id, github_repo: 'codemontage')
Expand Down