Probably never given how broad the field of psychology is. The demarcation line probably runs somewhere through the field, but to separate the two sides between science and not science is an open problem. Hell, it cosmology and evolution also suffer from similar problems, but those fields are far less controversial.