fixed and refactoring

YaroSpace · YaroSpace · commit 2d583191c032 · 2014-10-26T12:01:01.000Z
fix for ajax validations wihtout parameter

create logig refactoring
diff --git a/.rspec b/.rspec
@@ -1,4 +1,4 @@
 --require spec_helper
---format documentation
+--format Fuubar
 --color
-#--profile
+--profile
diff --git a/app/assets/stylesheets/product_description.css.scss b/app/assets/stylesheets/product_description.css.scss
@@ -211,6 +211,17 @@
         margin: 0 auto 3% auto;
       }
 
+      .notice {
+        font-size: 1.4em;
+        background: $green;
+        color: #fff;
+        padding: 1%;
+        text-align: center;
+        display: block;
+        width: 50%;
+        margin: 0 auto 3% auto;
+      }
+
       .errors {
         width: 90%;
         background: $red;
@@ -423,6 +434,10 @@
             color: #5f5f5f;
             font-family: "MuseoSans-500";
           }
+
+          @media screen and (min-width: 768px) {
+            min-height: 55px;
+          }
         }
 
         .selected {
@@ -1166,4 +1181,4 @@
 
 }
 
-//body end
+//body end
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -78,30 +78,29 @@ def new
   end
 
   def create
-    team_params = params.require(:team).permit(:selected, :slug, :name)
-    selected = team_params.fetch(:selected, nil)
+    team_params = params.require(:team).permit(:name, :slug, :show_similar, :join_team)
+    team_name = team_params.fetch(:name, '')
 
-    @teams = Team.with_similar_names(team_params[:name])
-
-    unless selected == 'false' || @teams.empty?
-      @new_team_name = team_params[:name]
+    @teams = Team.with_similar_names(team_name)
+    if team_params[:show_similar] == 'true' && !@teams.empty?
+      @new_team_name = team_name
       render 'similar_teams' and return
     end
 
-    if selected == 'true'
+    if team_params[:join_team] == 'true'
       @team = Team.where(slug: team_params[:slug]).first
       render :create and return
     end
 
-    @team = Team.new(name: team_params[:name])
+    @team = Team.new(name: team_name)
     if @team.save
       record_event('created team')
       @team.add_user(current_user)
 
       flash.now[:notice] = "Successfully created a team #{@team.name}"
-      render :create
     else
-      flash[:error] = "There was an error in creating a team #{@team.name}"
+      message = @team.errors.full_messages.join("\n")
+      flash[:error] = "There was an error in creating a team #{@team.name}\n#{message}"
     end
   end
 
diff --git a/app/controllers/usernames_controller.rb b/app/controllers/usernames_controller.rb
@@ -1,6 +1,11 @@
 class UsernamesController < ApplicationController
   skip_before_action :require_registration
 
+  def index
+    # returns nothing if validation is run agains empty params[:id]
+    render nothing: true
+  end
+
   def show
     # allow validation to pass if it's the user's username that they're trying to validate (for edit username)
     if signed_in? && current_user.username.downcase == params[:id].downcase
@@ -11,4 +16,4 @@ def show
       head :ok
     end
   end
-end
+end
diff --git a/app/views/teams/_form.html.haml b/app/views/teams/_form.html.haml
@@ -7,5 +7,6 @@
         = f.text_field :name
 
       -if @team.new_record?
+        = hidden_field_tag('team[show_similar]', true)
         .save
           %input.button{ type: 'submit', value: 'Next' }
diff --git a/app/views/teams/_payment.html.haml b/app/views/teams/_payment.html.haml
@@ -1,6 +1,11 @@
 .intro
   - if @team.can_upgrade?
     %h2.plans-heading Select a plan and enter payment details to get started
+  - unless flash[:notice].blank?
+    %span.notice#notice
+      -flash[:notice].split("\n").each do |notice|
+        = notice
+        %br
   - unless flash[:error].blank?
     %span.error#error
       -flash[:error].split("\n").each do |error|
diff --git a/app/views/teams/_similar_teams.html.haml b/app/views/teams/_similar_teams.html.haml
@@ -7,9 +7,9 @@
           .team-avatar
             =image_tag(team.avatar_url)
           %h4= link_to team.name, teamname_path(:slug => team.slug), :target => :new
-          = link_to 'Select', teams_path(Team.new, :team => { :slug=> team.slug, selected: true }), :remote => true, :method => :post, :class => "select"
+          = link_to 'Select', teams_path(:team => { :slug=> team.slug, join_team: true }), :remote => true, :method => :post, :class => "select"
 
 - unless exact_team_exists?(@teams, @new_team_name)
   .just-create-team
     %h3 None of the above are my team
-    = link_to "Create team #{@new_team_name}", teams_path(Team.new, :team => { :name => @new_team_name, selected: false }), :remote => true, :method => :post, :class => "create-team"
+    = link_to "Create team #{@new_team_name}", teams_path(:team => { :name => @new_team_name }), :remote => true, :method => :post, :class => "create-team"
diff --git a/app/views/teams/create.js.erb b/app/views/teams/create.js.erb
@@ -1,7 +1,3 @@
-var notificationBar = $('#main-content').find('.notification-bar');
-notificationBar.find('.notification-bar-inside').find('p').html("<%= flash[:error] || flash[:notice] %>");
-notificationBar.show();
-
 $('section.feature:not(.payment)').hide();
 $('section.feature.payment').append('<%= escape_javascript(render :partial => "payment", :locals => {:account => @team.account || @team.build_account, :plan => @team.account.try(:current_plan)}) %>');
 $('section.feature.payment').show();
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -17,5 +17,5 @@
   config.middleware.use RackSessionAccess::Middleware # alloes to set session from within Capybara
 
   Rails.logger = Logger.new(STDOUT)
-  Rails.logger.level = Logger::DEBUG # provides more verbose output testing with headless browsers in case of errors
+  Rails.logger.level = Logger::DEBUG # provides more verbose output when testing with headless browsers in case of errors
 end
diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb
@@ -47,16 +47,16 @@
     end
 
     context 'a team is selected from a list of similar teams' do
-      it 'renders a template with a choice of tariff plans when user picks a name from existing names' do
+      it 'renders a template with a choice of tariff plans when user joins and existing team' do
         allow(Team).to receive(:where).and_return(['team_1', 'team_2'])
-        post :create, :team => { selected: 'true', slug: 'team_name' }, format: :js
+        post :create, :team => { join_team: 'true', slug: 'team_name' }, format: :js
 
         expect(assigns[:team]).to eq('team_1')
         expect(response).to render_template('create')
       end
 
-      it 'renders a template with a choice of tariff plans if user picks his own team name' do
-        post :create, :team => { name: 'team_name', selected: 'false' }, format: :js
+      it 'renders a template with a choice of tariff plans if user picks supplied team name' do
+        post :create, :team => { name: 'team_name' }, format: :js
         expect(response).to render_template('create')
       end
     end
@@ -88,13 +88,13 @@
       it 'renders template with option to join' do
         expect(response).to be_success
         expect(response).to render_template('create')
-        expect(flash[:notice]).to eq("Successfully created a team team_name")
+        expect(flash[:notice]).to include("Successfully created a team team_name")
       end
 
       it 'renders failure notice' do
         allow(team).to receive(:save).and_return(false)
         response
-        expect(flash[:error]).to eq("There was an error in creating a team team_name")
+        expect(flash[:error]).to include("There was an error in creating a team team_name")
       end
     end
 
@@ -105,7 +105,7 @@
       end
 
       it 'renders a template with a list of similar teams' do
-        post :create, :team => { name: 'team_name' }, format: :js
+        post :create, :team => { name: 'team_name', show_similar: 'true' }, format: :js
 
         expect(assigns[:new_team_name]).to eq('team_name')
         expect(response).to render_template('similar_teams')
