Merge branch 'add-sessions'

Conflicts: .gitignore app/views/layouts/application.html.erb Yep.
mamhoff · Dec 2, 2013 · fa947b5 · fa947b5
2 parents bdb56ab + 8f5d229
commit fa947b5
Show file tree

Hide file tree

Showing 17 changed files with 204 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,6 +19,7 @@ group :test do
   gem 'selenium-webdriver', '2.35.1'
   gem 'capybara', '2.1.0'
   gem 'libnotify', '0.8.0'
+  gem 'factory_girl_rails', '4.2.1'
 end
 
 # Use Bootstrap and less.js for stylesheets

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,6 +51,11 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.0.2)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.3)
@@ -196,6 +201,7 @@ DEPENDENCIES
   capybara (= 2.1.0)
   childprocess (= 0.3.6)
   coffee-rails (~> 4.0.0)
+  factory_girl_rails (= 4.2.1)
   guard-rspec (= 2.5.0)
   guard-spork (= 1.5.0)
   jbuilder (~> 1.2)

diff --git a/app/assets/javascripts/admins.js.coffee b/app/assets/javascripts/admins.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/admins.css.less b/app/assets/stylesheets/admins.css.less
@@ -0,0 +1,30 @@
+// Place all the styles related to the Admins controller here.
+// They will automatically be included in application.css.
+// You can use Less here: http://lesscss.org/
+
+.box_sizing() {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+
+input, textarea, select, .uneditable-input {
+  border: 1px solid #bbb;
+  width: 100%;
+  margin-bottom: 15px;
+  .box_sizing;
+}
+
+input {
+  height: auto !important;
+}
+
+#error_explanation {
+  color: #f00;
+  ul {
+    list-style: none;
+    margin: 0 0 18px 0;
+  }
+}
+
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -11,3 +11,6 @@
  *= require_self
  *= require_tree .
  */
+/*
+ *= require twitter/bootstrap
+ */
diff --git a/app/assets/stylesheets/static_pages.css.less b/app/assets/stylesheets/static_pages.css.less
@@ -1,3 +1,22 @@
 // Place all the styles related to the StaticPages controller here.
 // They will automatically be included in application.css.
 // You can use Less here: http://lesscss.org/
+
+.box_sizing {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+
+input, textarea, select, .uneditable-input {
+  border: 1px solid #bbb;
+  width: 100%;
+  margin-bottom: 15px;
+  .box_sizing;
+}
+
+input {
+  height: auto !important;
+}
+
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
@@ -0,0 +1,26 @@
+class AdminsController < ApplicationController
+  def new
+  	@admin = Admin.new
+  end
+
+  def show
+  	@admin = Admin.find(params[:id])
+  end
+
+  def create
+  	@admin = Admin.new(admin_params)
+  	if @admin.save
+  		flash[:success] = "Welcome to the Solar Explorer!"
+  		redirect_to @admin
+  	else
+  		render 'new'
+  	end
+  end
+
+  private
+  	def admin_params
+  		 params.require(:admin).permit(:name, :email, :password,
+                                   :password_confirmation)
+  	end
+
+end
diff --git a/app/helpers/admins_helper.rb b/app/helpers/admins_helper.rb
@@ -0,0 +1,2 @@
+module AdminsHelper
+end
diff --git a/app/views/admins/new.html.erb b/app/views/admins/new.html.erb
@@ -0,0 +1,23 @@
+<% provide(:title, "Administrator sign up") %>
+<h1>Administrator sign up</h1>
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <%= form_for(@admin) do |f| %>
+      <%= render 'shared/error_messages' %>
+
+      <%= f.label :name %>
+      <%= f.text_field :name %>
+
+      <%= f.label :email %>
+      <%= f.text_field :email %>
+
+      <%= f.label :password %>
+      <%= f.password_field :password %>
+
+      <%= f.label :password_confirmation, "Confirmation" %>
+      <%= f.password_field :password_confirmation %>
+
+      <%= f.submit "Create new admin", class: "btn btn-large btn-primary" %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/admins/show.html.erb b/app/views/admins/show.html.erb
@@ -0,0 +1,3 @@
+<% provide(:title, @admin.name) %>
+<h1><%= "Profil für #{@admin.name}" %></h1>
+<p><%= "Name: #{@admin.name}, E-Mail: #{@admin.email }" %></p>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,7 +8,10 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-    <div class="container">
+    <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/shared/_error_messages.html.erb b/app/views/shared/_error_messages.html.erb
@@ -0,0 +1,12 @@
+<% if @admin.errors.any? %>
+  <div id="error_explanation">
+    <div class="alert alert-error">
+      The form contains <%= pluralize(@admin.errors.count, "error") %>.
+    </div>
+    <ul>
+    <% @admin.errors.full_messages.each do |msg| %>
+      <li>* <%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -1,5 +1,7 @@
-<% provide(:title, 'Impressum') %>
-<h1>Hauptseite/h1>
+<% provide(:title, 'Home') %>
+<div class="page-header">
+	<h1>Hauptseite</h1>
+</div>
 <p>
   Schauen sie mal, was für ein Boot...
 </p>
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -33,4 +33,7 @@
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # In testing, passwords should not take long
+  ActiveModel::SecurePassword.min_cost = true
 end
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,6 @@
 SolarExplorer::Application.routes.draw do
+  resources :admins
+
   get "static_pages/home"
   get "static_pages/imprint"
   get "static_pages/boat"

diff --git a/spec/factories.rb b/spec/factories.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :admin do
+    name     "Martin Meyerhoff"
+    email    "[email protected]"
+    password "foobar"
+    password_confirmation "foobar"
+  end
+end
diff --git a/spec/requests/admin_pages_spec.rb b/spec/requests/admin_pages_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe "Admin pages" do
+
+  subject { page }
+
+  describe "profile page" do
+    let(:admin) { FactoryGirl.create(:admin) }
+    before { visit admin_path(admin) }
+
+    it { should have_content(admin.name) }
+    it { should have_title(admin.name) }
+  end
+  describe "signup page" do
+    before { visit new_admin_path }
+
+    it { should have_content('Administrator sign up') }
+    it { should have_title('Administrator sign up') }
+  end
+
+  describe "signup" do
+
+    before { visit new_admin_path }
+
+    let(:submit) { "Create new admin" }
+
+    describe "with invalid information" do
+      it "should not create a user" do
+        expect { click_button submit }.not_to change(Admin, :count)
+      end
+    end
+
+    describe "with valid information" do
+      before do
+        fill_in "Name",         with: "Example User"
+        fill_in "Email",        with: "[email protected]"
+        fill_in "Password",     with: "foobar"
+        fill_in "Confirmation", with: "foobar"
+      end
+
+      it "should create a user" do
+        expect { click_button submit }.to change(Admin, :count).by(1)
+      end
+
+      describe "after saving the user" do
+        before { click_button submit }
+        let(:admin) { Admin.find_by(email: '[email protected]') }
+
+        it { should have_title(admin.name) }
+        it { should have_selector('div.alert.alert-success', text: 'Welcome') }
+      end
+    end
+  end
+
+end