minor refactoring to ease testing

YaroSpace · just3ws · commit ccc3c033873c · 2014-10-24T10:40:36.000-05:00
split rendering similar teams into a separate template

refactored #creare and added specs

refactored #exact_team_exists? and added specs

added shared notification_bar partial and linked to product_description layout

added showing notifications on team creation
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -79,33 +79,33 @@ def new
 
   def create
     team_params = params.require(:team).permit(:selected, :slug, :name)
-    selected = team_params.fetch(:selected, nil)
-    team_name = team_params.fetch(:name, '')
 
-    @teams = Team.with_similar_names(team_name)
-
-    if selected == 'true'
+    if team_params.fetch(:selected, nil) == 'true'
       @team = Team.where(slug: team_params[:slug]).first
       render :create and return
     end
 
-    unless selected == 'false' || @teams.empty?
-      @new_team_name = team_name
+    @teams = Team.with_similar_names(team_params[:name])
+    unless @teams.empty?
+      @new_team_name = team_params[:name]
       render 'similar_teams' and return
     end
 
-    @team = Team.new(name: team_name)
+    @team = Team.new(name: team_params[:name])
     if @team.save
+    # TODO show flash on success or falure
       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}"
     end
   end
 
+  def get_similar_teams(name)
+    name.gsub!(/ \-\./, '.*')
+    #TODO move to Team scope
+    teams = Team.any_of({ :name => /#{name}.*/i }).limit(3).to_a
+    teams.empty? ? nil : teams
+  end
+
   def edit
     edit_params = params.permit(:slug, :id)
 
diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb
@@ -39,24 +39,16 @@
     end
   end
 
-  describe "#create" do
-    let(:team) { Fabricate.build(:team, name: 'team_name') }
+  describe "#create" , focus: true  do
+    let(:team) { Fabricate.build(:team) }
+
+    it 'renders an error message if action was unsuccessful' do
 
-    before do
-      allow(Team).to receive(:with_similar_names).and_return([])
     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
-        allow(Team).to receive(:where).and_return(['team_1', 'team_2'])
+      it 'renders a template with a choice of tariff plans when user selects a team' do
         post :create, :team => { selected: '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
         expect(response).to render_template('create')
       end
     end
@@ -65,6 +57,8 @@
       let(:response) { post :create, :team => { name: 'team_name' }, format: :js }
 
       before do
+        allow(controller).to receive(:get_similar_teams).and_return(nil)
+
         allow(Team).to receive(:new).and_return(team)
         allow(team).to receive(:save).and_return(true)
         allow(team).to receive(:add_user).and_return(true)
@@ -88,13 +82,6 @@
       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")
-      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")
       end
     end
 
@@ -106,8 +93,6 @@
 
       it 'renders a template with a list of similar teams' do
         post :create, :team => { name: 'team_name' }, format: :js
-
-        expect(assigns[:new_team_name]).to eq('team_name')
         expect(response).to render_template('similar_teams')
       end
     end
