+
diff --git a/app/views/members/new.html.haml b/app/views/members/new.html.haml
index d1f4b90bf..cbc0aea9f 100644
--- a/app/views/members/new.html.haml
+++ b/app/views/members/new.html.haml
@@ -1,25 +1,35 @@
-#new_member
- %h3 Become a member
- = simple_form_for @member do |f|
- .row
- .half
- = f.input :name
- .half
- = f.input :surname
+%section#member
+ .titlebox.mission
+ %h2
+ Become a member
+ .dot
+ .description
+ %p.lead
+ = simple_form_for @member do |f|
+ .row
+ .half
+ = f.input :name
+ .half
+ = f.input :surname
- .row
- .half
- = f.input :email
- .half
- = f.input :twitter
+ .row
+ .half
+ = f.input :email
+ .half
+ = f.input :twitter
- = f.input :about_you, as: :text, label: "Tell us a little bit about yourself"
+ = f.input :about_you, as: :text, label: "Tell us a little bit about yourself"
- %p
- Select the notifications you would like to receive
- %br
- %small e.g. if you would like to attend some of the sessions as a student but you may also be able to help out with coaching sometimes select both Student and Coach
- = f.association :roles, as: :check_boxes, label: false
+ %p
+ = f.association :roles, as: :check_boxes, label: "Sign up as a"
+ %ul.hint
+ %li if you want to learn but also have some programming related skills you want to share, you can select both Student and Coach
+ %li
+ You can only sign up as a Student
+ %ul
+ %li if you are a woman, or
+ %li you are part of a group underrepresented in the tech industry, or
+ %li you succesfuly convince at least two women friends of yours, how amazing programming is and get them to join us and start attending our sesions.
- .form-footer
- = f.submit "Join #{t("brand")}"
+ .form-footer
+ = f.submit "Join #{t("brand")}"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 936f8e223..4d673397f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -11,6 +11,7 @@ en:
email_title: "%A, %d %b at %H:%M"
short: "%d/%m/%Y %H:%M "
date: "%d %B %Y"
+ website_format: "%A, %d %B %Y at %H:%M"
messages:
accepted_invitation: "Thanks for getting back to us %{name}. See you at the session!"
@@ -19,4 +20,4 @@ en:
not_attending_already: "You have alredy confirmed you can't make it!"
no_available_seats: "Unfortunately there are no more spaces left :(. If you would like to join our waiting list send us an email at meetings@codebar.io."
member_notifications: "You will be receiving notifications for: %{roles}"
- no_roles: "You have not signed up for any notifications. If you change your mind, send us an email at meetins@codebar.io so we can change your settings"
+ no_roles: "You have not selected any roles so you won't be receiving any notifications. If you change your mind, send us an email at hello@codebar.io so we can change your settings."
diff --git a/config/routes.rb b/config/routes.rb
index fcdb760fa..674693060 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,7 @@
root "dashboard#show"
get "code-of-conduct" => "dashboard#code", as: :code_of_conduct
+ get "wall-of-fame" => "dashboard#wall_of_fame", as: :wall_of_fame
resource :members, only: [:new, :create]
diff --git a/db/migrate/20131110220757_add_website_to_sponsor.rb b/db/migrate/20131110220757_add_website_to_sponsor.rb
new file mode 100644
index 000000000..17726b63c
--- /dev/null
+++ b/db/migrate/20131110220757_add_website_to_sponsor.rb
@@ -0,0 +1,5 @@
+class AddWebsiteToSponsor < ActiveRecord::Migration
+ def change
+ add_column :sponsors, :website, :string
+ end
+end
diff --git a/db/migrate/20131111024701_add_role_to_session_invitations.rb b/db/migrate/20131111024701_add_role_to_session_invitations.rb
new file mode 100644
index 000000000..665893866
--- /dev/null
+++ b/db/migrate/20131111024701_add_role_to_session_invitations.rb
@@ -0,0 +1,5 @@
+class AddRoleToSessionInvitations < ActiveRecord::Migration
+ def change
+ add_column :session_invitations, :role, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 53a28dfa0..8f7107ee9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20131107182457) do
+ActiveRecord::Schema.define(version: 20131111024701) do
create_table "addresses", force: true do |t|
t.string "flat"
@@ -93,6 +93,7 @@
t.datetime "created_at"
t.datetime "updated_at"
t.string "token"
+ t.string "role"
end
add_index "session_invitations", ["member_id"], name: "index_session_invitations_on_member_id"
@@ -125,6 +126,7 @@
t.datetime "created_at"
t.datetime "updated_at"
t.string "avatar"
+ t.string "website"
end
end
diff --git a/spec/fabricators/session_fabricator.rb b/spec/fabricators/session_fabricator.rb
index bd7f46772..1a39c0fb5 100644
--- a/spec/fabricators/session_fabricator.rb
+++ b/spec/fabricators/session_fabricator.rb
@@ -1,4 +1,5 @@
Fabricator(:sessions) do
seats 1
- date_and_time { DateTime.new }
+ date_and_time { DateTime.now+2.days }
+ title "Course title"
end
diff --git a/spec/fabricators/session_invitation_fabricator.rb b/spec/fabricators/session_invitation_fabricator.rb
index a205c06e7..a65c56d7a 100644
--- a/spec/fabricators/session_invitation_fabricator.rb
+++ b/spec/fabricators/session_invitation_fabricator.rb
@@ -9,3 +9,15 @@
Fabricator(:attending_session_invitation, from: :session_invitation) do
attending true
end
+
+Fabricator(:attended_session_invitation, from: :session_invitation) do
+ attended true
+end
+
+Fabricator(:student_session_invitation, from: :session_invitation) do
+ role "Student"
+end
+
+Fabricator(:coach_session_invitation, from: :session_invitation) do
+ role "Coach"
+end
diff --git a/spec/fabricators/sponsor_fabricator.rb b/spec/fabricators/sponsor_fabricator.rb
index c9edc15d7..ed3bf74a8 100644
--- a/spec/fabricators/sponsor_fabricator.rb
+++ b/spec/fabricators/sponsor_fabricator.rb
@@ -1,6 +1,6 @@
Fabricator(:sponsor) do
name { Faker::Name.name }
- description { Faker::Lorem.paragraph }
+ website { Faker::Internet.domain_name }
avatar { Faker::Internet.url }
address { Fabricate(:address) }
end
diff --git a/spec/features/listing_sessions_spec.rb b/spec/features/listing_sessions_spec.rb
deleted file mode 100644
index d2ed18fd1..000000000
--- a/spec/features/listing_sessions_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-feature 'session listing' do
-
- let(:date_and_time) { DateTime.now+1.week }
- let!(:session) { Sessions.create title: "HTML by Codebar",
- description: "Let's work together through out mini HTML workshop",
- date_and_time: date_and_time,
- sponsors: [Fabricate.build(:sponsor)] }
-
- scenario 'when i visit the page, i can view a list with all the sesions' do
- pending("on hold until we finish the home page design")
- visit root_path
-
- expect(page).to have_content session.title
- end
-end
diff --git a/spec/features/member_joining_spec.rb b/spec/features/member_joining_spec.rb
index aedd02f3f..4053dc9b3 100644
--- a/spec/features/member_joining_spec.rb
+++ b/spec/features/member_joining_spec.rb
@@ -12,7 +12,7 @@
fill_in_member_details name
click_on "Join Codebar.io"
- page.should have_content "Thanks for signing up #{name}! You have not signed up for any notifications. If you change your mind, send us an email at meetins@codebar.io so we can change your settings"
+ page.should have_content "Thanks for signing up #{name}! #{I18n.t("messages.no_roles")}"
end
context "a member can sign up" do
diff --git a/spec/features/viewing_a_course_spec.rb b/spec/features/viewing_a_course_spec.rb
index dfc0c9492..637efc709 100644
--- a/spec/features/viewing_a_course_spec.rb
+++ b/spec/features/viewing_a_course_spec.rb
@@ -5,17 +5,28 @@
let(:date_and_time) { DateTime.now+1.week }
let!(:course) { Fabricate(:course) }
- scenario "i can view a course's information" do
- visit root_path
- click_on "Courses"
- click_on course.title
+ scenario "i can view a course's information" do
+ visit course_path(course)
expect(page).to have_content course.title
expect(page).to have_content course.tutor.full_name
expect(page).to have_content course.description
expect(page).to have_content course.short_description
expect(page).to have_content course.url
+
+ expect(page).to have_content "Sign up to the course"
+ end
+
+ context "signing up is not available" do
+
+ scenario "when there are seats left" do
+ course.update_attribute(:seats, 0)
+ visit course_path(course)
+
+ expect(page).to have_content "This course is fully booked!"
+
+ end
end
end
diff --git a/spec/features/visiting_homepage_spec.rb b/spec/features/visiting_homepage_spec.rb
new file mode 100644
index 000000000..e12006c05
--- /dev/null
+++ b/spec/features/visiting_homepage_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+feature 'when visiting the homepage' do
+
+ let!(:next_session) { Fabricate(:sessions) }
+ let!(:next_course) { Fabricate(:course) }
+
+ before(:each) do
+ visit root_path
+ end
+
+ scenario "i can view the next session" do
+
+ expect(page).to have_content next_session.title
+ expect(page).to have_content next_session.description
+ expect(page).to have_content I18n.l(next_session.date_and_time, format: :website_format)
+ end
+
+ scenario "i can view the next course" do
+
+ expect(page).to have_content next_course.title
+ expect(page).to have_content next_course.short_description
+ expect(page).to have_content I18n.l(next_course.date_and_time, format: :website_format)
+ end
+
+ scenario "i can access the code of conduct" do
+ click_on "code of conduct"
+ click_on "Read the full version"
+
+ expect(page).to have_content "Code of conduct"
+ expect(page).to have_content "The Quick Version"
+ expect(page).to have_content "The Long Version"
+ end
+
+ scenario "i can access becoming a member" do
+ click_on "Become a member"
+
+ expect(page).to have_content "Become a member"
+ expect(page).to have_content "You can only sign up"
+ end
+end
diff --git a/spec/models/course_spec.rb b/spec/models/course_spec.rb
index 89b3f6170..1a02ce456 100644
--- a/spec/models/course_spec.rb
+++ b/spec/models/course_spec.rb
@@ -13,9 +13,11 @@
end
context "scopes" do
+ let!(:next_course) { Fabricate(:course, date_and_time: DateTime.now+2.days) }
+
before do
- 2.times { Fabricate(:course, date_and_time: DateTime.now+1.week) }
- 1.times { Fabricate(:course, date_and_time: DateTime.now-1.week) }
+ Fabricate(:course, date_and_time: DateTime.now+1.week)
+ Fabricate(:course, date_and_time: DateTime.now-1.week)
end
it "#upcoming" do
@@ -25,6 +27,10 @@
it "#past" do
Course.past.count.should eq 1
end
+
+ it "#next" do
+ Course.next.should eq next_course
+ end
end
it "#attending" do
diff --git a/spec/models/invitation_manager_spec.rb b/spec/models/invitation_manager_spec.rb
index fba0bca97..73d1272ab 100644
--- a/spec/models/invitation_manager_spec.rb
+++ b/spec/models/invitation_manager_spec.rb
@@ -9,7 +9,7 @@
Member.should_receive(:students).and_return(students)
students.each do |student|
- SessionInvitation.should_receive(:create).with(sessions: session, member: student)
+ SessionInvitation.should_receive(:create).with(sessions: session, member: student, role: "Student")
end
InvitationManager.send_session_emails session
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 668f43bfd..f60e5c30e 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -54,6 +54,15 @@
encrypted_email = Digest::MD5.hexdigest(member.email.strip.downcase)
member.avatar.should eq "http://gravatar.com/avatar/#{encrypted_email}?s=100"
end
+
+
+ it "#attended_sessions" do
+ member.session_invitations = 3.times.map { Fabricate(:attended_session_invitation) }
+ member.session_invitations << Fabricate(:session_invitation)
+
+ member.attended_sessions.count.should eq 3
+ end
+
end
context "scopes" do
@@ -71,5 +80,6 @@
Member.coaches.count.should eq 6
end
end
+
end
end
diff --git a/spec/models/session_invitation_spec.rb b/spec/models/session_invitation_spec.rb
index 41e71617d..894b154f1 100644
--- a/spec/models/session_invitation_spec.rb
+++ b/spec/models/session_invitation_spec.rb
@@ -8,11 +8,30 @@
it "#send_reminder" do
invitation.update_attribute(:attending, true)
- mailer = mock(SessionInvitationMailer, deliver: nil)
+ mailer = double(SessionInvitationMailer, deliver: nil)
SessionInvitationMailer.should_receive(:remind_student).
with(invitation.sessions, invitation.member, invitation).and_return(mailer)
invitation.send_reminder
end
+
+ context "scopes" do
+ let!(:attended) { 3.times.map { Fabricate(:attended_session_invitation) } }
+ let!(:to_students) { 6.times.map { Fabricate(:student_session_invitation) } }
+ let!(:to_coaches) { 4.times.map { Fabricate(:coach_session_invitation) } }
+
+ it "#attended" do
+ SessionInvitation.attended.count.should eq attended.length
+ end
+
+ it "#to_coaches" do
+ SessionInvitation.to_coaches.count.should eq to_coaches.length
+ end
+
+ it "#to_student" do
+ SessionInvitation.to_students.count.should eq to_students.length
+ end
+ end
+
end
diff --git a/spec/models/sponsor_spec.rb b/spec/models/sponsor_spec.rb
index 6daf6d531..6f3b5b1b4 100644
--- a/spec/models/sponsor_spec.rb
+++ b/spec/models/sponsor_spec.rb
@@ -4,7 +4,7 @@
subject(:sponsor) { Fabricate.build(:sponsor) }
it { should respond_to(:name) }
- it { should respond_to(:description) }
+ it { should respond_to(:website) }
it { should respond_to(:address) }
it { should respond_to(:sessions) }
it { should respond_to(:sponsor_sessions) }
@@ -19,11 +19,11 @@
it { should_not be_valid }
it { should have(1).error_on(:name) }
end
- describe '#description' do
- before { sponsor.description = nil }
+ describe '#website' do
+ before { sponsor.website = nil }
it { should_not be_valid}
- it { should have(1).error_on(:description) }
+ it { should have(1).error_on(:website) }
end
describe '#address' do
before { sponsor.address = nil }
@@ -41,4 +41,13 @@
end
end
-end
\ No newline at end of file
+ context "scopes" do
+ let!(:past) { 2.times.map { Fabricate(:sponsor) } }
+ let!(:latest) { 7.times.map { Fabricate(:sponsor) } }
+
+ it "#latest" do
+ Sponsor.latest.should eq latest.reverse
+ end
+ end
+
+end