We review previous research on the teaching and learning of thermodynamics in upper-level, undergraduate settings. As chemistry education researchers we use physical chemistry as a context for understanding the literature. During our synthesis four themes of research emerged: factors that influence student success in learning thermodynamics, understanding thermodynamics through mathematical concepts and representations, student reasoning using the particulate nature of matter, and students' alternative thermodynamic conceptions. We also draw from literature in physics education research, engineering education research, and research on undergraduate mathematics education communities to widen our perspective on the teaching and learning of thermodynamics across disciplines. Following our presentation of studies, we discuss gaps in the literature and directions for new research in line with the recommendations of the National Research Council's (2012) recent report on Discipline-Based Education Research. We also discuss implications for practice which we hope will provide increased pedagogical support for teaching thermodynamics in upper-level, undergraduate settings, especially physical chemistry.