Merge remote-tracking branch 'origin/master'

SpeciesFileGroup · Feb 5, 2015 · e16e2d6 · e16e2d6
2 parents 00db043 + f813e40
commit e16e2d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/assets/javascripts/maps.js b/app/assets/javascripts/maps.js
@@ -166,12 +166,13 @@ function addClickListener(event) {
                     if(this_property.id != area_id) {
                         //map.data.getFeatureById(01).getProperty('geographic_area')
                         map.data.overrideStyle(this_feature, {fillColor: '#000000'});  //  black
+                        map.data.overrideStyle(this_feature, {strokeWeight: 1});       // erase borders
                         map.data.overrideStyle(this_feature, {fillOpacity: 0.0});       // transparent
                         jj = jj + 1;
                     }
                     if(this_property.id == area_id) {
                         map.data.overrideStyle(this_feature, {fillColor: '#FF0000'});  //  red
-                        map.data.overrideStyle(this_feature, {strokeWeight: 2});       //embolden borders
+                        map.data.overrideStyle(this_feature, {strokeWeight: 3});       //embolden borders
                         map.data.overrideStyle(this_feature, {fillOpacity: 1.0});       // transparent
                     }
                 });

diff --git a/app/controllers/taxon_names_controller.rb b/app/controllers/taxon_names_controller.rb
@@ -33,7 +33,8 @@ def create
 
     respond_to do |format|
       if @taxon_name.save
-        format.html { redirect_to @taxon_name.metamorphosize, notice: 'Taxon name was successfully created.' }
+        format.html { redirect_to @taxon_name.metamorphosize,
+                                  notice: "Taxon name '#{@taxon_name.name}' was successfully created." }
         format.json { render action: 'show', status: :created, location: @taxon_name }
       else
         format.html { render action: 'new' }

diff --git a/spec/features/taxon_names_spec.rb b/spec/features/taxon_names_spec.rb
@@ -78,8 +78,8 @@
       fill_autocomplete('parent_id_for_name', with: 'root')
 
       click_button('Create Taxon name') # when I click the 'Create Taxon name' button
-      # then I get the message "Taxon name 'Foodiae' was successfully created"
-      expect(page).to have_content('Taxon name was successfully created.')
+      # then I get the message "Taxon name 'Foodiae' was successfully created."
+      expect(page).to have_content("Taxon name 'Fooidae' was successfully created.")
     end
   end
 end