stuff

mamhoff · Dec 12, 2013 · 6cdcd25 · 6cdcd25
1 parent 6726446
commit 6cdcd25
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 41 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -10,7 +10,11 @@ class User < ActiveRecord::Base
   has_and_belongs_to_many :roles 
 
   before_create :create_remember_token
-  before_save { self.email = email.downcase }
+  before_save do
+    pp email
+    self.email = email.downcase
+    pp self.email
+  end
 	validates :name, presence: true, length: { maximum: 50 }
 	VALID_EMAIL_REGEX = /\A[\w+.\-]+@[a-z\d.\-]+[\w][^\.]\.[a-z]{2,}/i
 	validates :email, presence: true, format: { with: VALID_EMAIL_REGEX },

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,19 +8,20 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-    <div class="container well">
-     <% flash.each do |key, value| %>
-        <%= content_tag(:div, value, class: "alert alert-#{key}") %>
-      <% end %>
+    <header class="row row-1">
       <ul>
-
       <% if signed_in? %>
-<li><%= link_to "Sign out", destroy_user_session_path, html_options: {class: 'btn' }, method: "delete" %></li>
+        <li><%= link_to "Sign out", destroy_user_session_path, class: 'btn', method: "delete" %></li>
       <% else %>
-<li><%= link_to "Sign up", new_user_registration_path, html_options: {class: 'btn'} %></li>
-<li><%= link_to "Sign in", new_user_session_path, html_options: {class: 'btn' } %></li>
-</ul>
+        <li><%= link_to "Sign up", new_user_registration_path, class: 'btn' %></li>
+        <li><%= link_to "Sign in", new_user_session_path, class: 'btn' %></li>
       <% end %>
+      </ul>
+    </header>
+    <div class="container well">
+    <% flash.each do |key, value| %>
+      <%= content_tag(:div, value, class: "alert alert-#{key}") %>
+    <% end %>
       <%= yield %>
       <%= debug(params) if Rails.env.development? %>
     </div>

diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
@@ -1,14 +1,12 @@
 <h1>Role index</h1>
-<div class="col-md-6 col-md-offset-3">
-<% @roles.each do |role| %>
-	<div class="well">
-	<p> <%= role.name %> 
-	<%= link_to "delete", role, method: :delete,  
+<div class="row">
+	<div class="col-md-6 col-md-offset-3">
+		<%= link_to "Create Role", new_role_path %> <br/>
+		<% @roles.each do |role| %>
+			<p> <%= role.name %> 
+				<%= link_to "delete", role, method: :delete,  
 							data: {confirm: "Are you sure?"},
-							title: role.name %>
-
-	</p>
+							title: role.name %>	</p>
+		<% end %>
 	</div>
-<% end %>
-<%= link_to "Create Role", new_role_path %>
 </div>
diff --git a/app/views/tours/index.html.erb b/app/views/tours/index.html.erb
@@ -1,15 +1,20 @@
 <h1>Tour index</h1>
-<div class="col-md-6 col-md-offset-3">
-<% @tours.each do |tour| %>
-	<div class="well">
-	<p> <%= tour.name %> <%= link_to "Buchen", new_wish_path %>
+
+<div class="row row-2">
+	<div class="col-md-6 col-md-offset-3">
 		<% if user_signed_in? && current_user.has_role?('admin') %>
-		<%= link_to "delete", tour, method: :delete,  
-								data: {confirm: "Are you sure?"},
-								title: tour.name %>
+			<%= link_to "Create tour", new_tour_path %>
+		<% end %>
+		<% @tours.each do |tour| %>
+			<div class="well">
+			<p> <%= tour.name %> <%= link_to "Buchen", new_wish_path(tour: tour.name) %>
+				<% if user_signed_in? && current_user.has_role?('admin') %>
+					<%= link_to "delete", tour, method: :delete,  
+											data: {confirm: "Are you sure?"},
+											title: tour.name %>
+				<% end %>
+			</p>
+			</div>
 		<% end %>
-	</p>
 	</div>
-<% end %>
-<%= link_to "Create tour", new_tour_path %>
-</div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -2,6 +2,7 @@
   get "users/show"
   get "users/index"
 
+  resources :wishes, only: [:new]
   resources :roles, only: [:new, :create, :index, :destroy]
   resources :tours, only: [:new, :create, :destroy, :index, :show]
   devise_for :users, :controllers => { registrations: 'users/registrations'}

diff --git a/spec/factories.rb b/spec/factories.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :user do
     name     "Example User"
-    sequence(:email) { |n| "user-#{n}@example.com" }
+    email  "user-80@example.com" 
     password "foobar"
     password_confirmation "foobar"
 
@@ -57,7 +57,7 @@
 	end
 
 	factory :tour do
-		name 	"First Tour"
+		sequence(:name) { |n| "Tour #{n}" }
 	end
 
 	factory :booking_status do

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -79,7 +79,11 @@
    describe "email address with mixed case" do
     mixed_case_email = "[email protected]"
       it "should be saved as all lower-case" do
-      funny_user = FactoryGirl.create(:user, email: mixed_case_email)
+      funny_user = FactoryGirl.create(:user)
+      funny_user.email =  mixed_case_email
+      #require 'pry'; binding.pry
+      funny_user.confirmed_at = Time.now
+      funny_user.save
       expect(funny_user.reload.email).to eq mixed_case_email.downcase
     end
   end
@@ -94,11 +98,9 @@
   	specify { expect(admin.roles).to eq [Role.find_by(name: "admin")] }
   end
 
-   it "FactoryGirl can create aa Guide at will" do
-  	 guide = FactoryGirl.create(:user, :guide) 
-  	pp guide.roles 
-  		expect(guide.has_role?("guide")).to eq true  
-
+  it "FactoryGirl can create a Guide at will" do
+	guide = FactoryGirl.create(:user, :guide) 
+	expect(guide.has_role?("guide")).to eq true
   end
 
   describe "unsetting a role" do

diff --git a/spec/views/roles/index.html.erb_spec.rb b/spec/views/roles/index.html.erb_spec.rb
@@ -26,6 +26,12 @@
     expect(page).to have_link("Create Role")
   end
 
+  it "should not have bootstrap columns without bootstrap rows as parents" do
+    expect(page).not_to have_selector(:xpath, \
+      "//div[contains(@class, 'col') and parent::*[not(contains(@class, 'row'))]]")
+  end
+
+
   describe "clicking a delete link" do
 
   	it "should decrease the role count by 1"	do

diff --git a/spec/views/tours/index.html.erb_spec.rb b/spec/views/tours/index.html.erb_spec.rb
@@ -2,11 +2,12 @@
 
 describe "roles/index.html.erb" do
   before do
-      FactoryGirl.create(:tour)
+      5.times { FactoryGirl.create(:tour) }
       visit tours_path
     end
 
   it "should have the word tour index" do
+    pp Capybara::default_driver
   	expect(page).to have_content("Tour index")
   end
 
@@ -18,6 +19,34 @@
     expect(page).to have_link("Buchen")
   end
 
+  it "should not have bootstrap columns without bootstrap rows as parents" do
+    expect(page).not_to have_selector(:xpath, \
+      "//div[contains(@class, 'col') and parent::*[not(contains(@class, 'row'))]]")
+  end
+
+  describe "all the links" do
+    # extract the urls from the elements found by "find"
+    let(:links) do
+      page.all(:xpath, "//div[@class='well']/p/a").map do |link_object|
+        link_object[:href]
+      end
+    end
+
+    let(:tournames) { Tour.all.map { |tour| CGI.escape(tour.name) } }
+
+    it "should be exactly as many as there are tours" do
+      expect(links.length).to eq tournames.length
+    end
+
+    it "each tour should have an associated link" do
+      result = true
+      tournames.each do |tourname|
+            result &= links.any? { |link| link[tourname] }
+      end
+      expect(result).to eq true
+    end
+  end
+
   describe "signed in as admin" do
 
     before do 
@@ -27,7 +56,7 @@
     end
 
     it "should have one tour" do
-      expect(Tour.count).to eq 1
+      expect(Tour.count).to eq 5
     end
 
     it "should have delete links" do